Basic Controller and Test Framework
Merge branch 'master' into barebones

Conflicts:
	Gemfile