Done with Part 1, pending uncommenting once Terin implements his functions
Merge branch 'master' of https://github.com/protacior/finalProject426

Conflicts:
	main.hh
	main.o
	moc_main.o
	peerster