Moved some stuff around to get CSS to attach
Merge branch 'master' of https://github.com/anotheranshu/thacks2014