Removed redundant tests
added basic splash screen home menu thingy
added test for splash view
messages controller and views
basic layout of homepage established
cleaned
more styling to splash
tests needs changing
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
Routes fix
Merge branch 'master' of https://github.com/fredmcgroarty/language_learning_project

Conflicts:
	spec/features/edit_profile_spec.rb
	spec/views/edit_profile_spec.rb
	spec/views/home_page_spec.rb
Added topics and languages with relevant tests
Fix specs
Merge branch 'editprofilepage' of https://github.com/RuslanVikhor/language_learning_project into RuslanVikhor-editprofilepage

Conflicts:
	spec/features/edit_profile_spec.rb
	spec/views/edit_profile_spec.rb
Edited tests
Merge pull request #7 from fredmcgroarty/languages

Added topics and languages with relevant tests
made tests pass from last merges
added default picture
message views refactored
Merge branch 'messages'