cleaned up routes file
Merge branch 'master' of https://github.com/ikitha/Project_2

Conflicts:
	config/routes.rb
Merging resolved