Added user login tests
Merge branch 'create_user_login_test' of github.com:sineadcoyle/MyEnergyUsage into create_user_login_test

Conflicts:
	features/step_definitions/user_login_steps.rb
	features/user_login.feature