Checkpoint
Merge branch 'master' of github.com:jamesbowman/atparty

Conflicts:
	atparty.cpp