profile fix
Merge branch 'master' of https://github.com/Tonnius/EE_Math_Test

Conflicts:
	app/views/salajane.blade.php
Hernes
Kaalikas
Redis
Merge remote-tracking branch 'origin/master' into deploy