Switched back  angular views into rails views
Merge branch 'renaming_stuff' of github.com:smarquez1/form_app into renaming_stuff

Conflicts:
	app/views/forms/new.html.haml
	app/views/layouts/application.html.haml
	config/routes.rb