added bye all
Merge branch 'master' of github.com:prestoncopeland/617_project

Conflicts:
	app/views/layouts/application.html.erb