added inherited_resources gem
created flat form file
Merge branch 'master' of https://github.com/elpassion/flatmate

Conflicts:
	config/routes.rb
angular flat_create controller