Prelim part 2 GUI
Merge branch 'master' of https://github.com/protacior/finalProject426

Conflicts:
	main.hh
	main.o
	moc_main.o
	peerster
Working late joining, midway through leaving
Almost done...
Merge branch 'master' of https://github.com/protacior/finalProject426

Conflicts:
	main.o
	moc_main.cpp
	moc_main.o
	peerster
Need to pull
Merge branch 'master' of https://github.com/protacior/finalProject426

Conflicts:
	main.o
	moc_main.o
	peerster
Rachel's completed Part 2