Having two computers makes comitting strange...
Merge branch 'web' of https://github.com/keatonboyle/cs130_bulletinator into web

Conflicts:
	web/getwolf.php