Some minor things to the main page and user page, I don't even really know
Merge branch 'master' of https://github.com/sheillashojaie/battlehack-app