Derp

Expanded rest of the floors
Revert "Derp"

This reverts commit a77cc18950af6051698d7cfc72597f5c5d1d2665.
derp

herp
Merge branch 'master' of https://github.com/quantsini/hackathon15