messages controller and views
Merge branch 'master' of github.com:fredmcgroarty/language_learning_project

Conflicts:
	app/models/user.rb
	config/routes.rb
	spec/helpers/registrations_helper_spec.rb
	spec/helpers/user_infos_helper_spec.rb
	spec/views/home_page_spec.rb