New Logo
Merge branch 'ryan_test'
Merge branch 'master' of github.com:mugu87/myApp

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/layouts/application.html.erb
didn't do this.