Revert "does this work"

This reverts commit 8c400f6d077704922cd7ef2a19c9de495c6df4de.
Merge branch 'master' of https://github.com/mhollands/Facebook-Hackathon-15-03-14