Updated master with the final version for 2016#6

Merged

stefanmendoza merged 9 commits intomasterfrom

Apr 27, 2016

Commits on Apr 18, 2016

Commits on Apr 21, 2016

Redid prize section
Stefan Mendoza
committed
Removed prize links
Stefan Mendoza
committed

Commits on Apr 22, 2016

Commits on Apr 23, 2016