FUCK GIT, added my route to config routes.rb
Merge branch 'aaron'

Conflicts:
	config/routes.rb
added ace