send my changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	FindItOut/scr/Styles/styleLogin.css
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 6b1839674c7c8d2ba0b4a584f0a35c0ec4d6bbbe.