controller formatted
Merge branch 'master' of https://github.com/travisdailey/rest_app

Conflicts:
	app/controllers/pages_controller.rb