Login test merge
merge login
change login /// fix bug i hope
Merge branch 'pr/3'

Conflicts:
	views/index/index.php