Test background
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Test background
Test background
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/login.html