fixed update edit profile bug needing refresh
Merge pull request #3 from ajcumine/master

fixed update edit profile bug needing refresh
added security merge with andy's bug fix in the update form
Added tests for delegations
Added rMagick and delegations to user class
Merge pull request #4 from fredmcgroarty/delegations

Delegations
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
Adding editing profile page feature
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