nav bar height adjusted
Merge branch 'master' of github.com:mikobautista/BattleStocks

Conflicts:
	app/views/home/index.html.erb