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

Conflicts:
	app/views/salajane.blade.php