v2 home
login v2
Merge branch 'newBranch'

Conflicts:
	views/pages/home.html
	views/views/login.html