pushing my changes
Merge branch 'master' of https://github.com/novoalg/cs485-1

Conflicts:
	config/routes.rb

:q
:Q:q