working commit premerge
Merge remote-tracking branch 'origin/commtemp' into comm
Merge remote-tracking branch 'origin/master' into comm

Conflicts:
	client/index.html
fixing all the stuff merge broke