added someting new to master
add new to master home
Merge branch 'newBranch'

Conflicts:
	views/pages/home.html
	views/views/login.html
addind in old branch
Merge branch 'master' of github.com:Opiant/opientTest into newBranch