demo ready, almost
Merge branch 'master' of https://github.com/anuragkapur/FT-HackDay-2013