Few updates

-New improved, sexy logo
-Updated code
Merge branch 'master' of https://github.com/SaileshPatel/CityBattles

Conflicts:
citybattles/public/stylesheets/style.css
citybattles/views/battle.jade
citybattles/views/login.jade
Few updates