lol
Merge branch 'master' of https://github.com/chungalung/HackForTheHomeless

Conflicts:
	Users.php
	distributionInfo.php
lol