Stalk other users
Merge branch 'Higify-1.0' of https://github.com/martinmine/higify into Higify-1.0

Conflicts:
	profile.php
	static/mainpage.css