Revert "Fix"

This reverts commit 05148fce857c49187507f9b42bc63c9cd44bebea.
Merge branch 'dev' of https://github.com/jmaslin/GoogleHackathon into dev