Yep done.
Merge branch 'master' of github.com:bmayes/RailsRestApiExample

Conflicts:
	config/routes.rb