Added Controllers
Merge branch 'master' of https://github.com/IanMitchell/Orange

Conflicts:
	config/routes.rb

GIT MERGED BRO