New user-login
logs
Merge branch 'master' of https://github.com/fray88/SocialUp

Conflicts:
	.gitignore
after conflicts