fixed a link, and fixed friendgroup -> friendGroup
unbroke login
Merge branch 'master' of https://github.com/johnpasquarello/Prinstagram

Conflicts:
	groups.php
	login.php