h
Merge branch 'develop'

Conflicts:
	index.php
main authentication page
develop gitignore
Merge branch 'master' of https://github.com/newzifyus/newzify into develop

Conflicts:
	.gitignore