Create tasks and tings like that
Merge branch 'master' of https://github.com/mhollands/Facebook-Hackathon-15-03-14