bug fixes
Merge branch 'master' of https://github.com/Ratsmash-dev/RMash

Conflicts:
	app/views/session/login.html.erb