Puts logo in navbar
Merge branch 'master' of github.com:onguyen89/eschoolwebsite into monday

Conflicts:
	app/assets/stylesheets/home.css.scss
	app/views/home/main.html.erb