Fixed login redirect
Merge branch 'master' of https://github.com/kayleyslane/Instafruit

Conflicts:
	Login.html
Merge branch 'master' of https://github.com/kayleyslane/Instafruit

Conflicts:
	Login.html
comment extra form in Login - set up Authenticate not to use head which
redirected and adjusted RegisterUser.php to add users.
johnh...
Committing a merge
Merge branch 'master' of https://github.com/kayleyslane/Instafruit

Conflicts:
	RegisterUser.php
added add friend functionality, doesnt work