Added comment to PeerPoint.cpp to test conflicts
Merge branch 'master' of https://github.com/jbang0317/PeerPoint.git

Conflicts:
	src/PeerPoint.cpp
Merge branch 'master' of https://github.com/jbang0317/PeerPoint.git

Conflicts:
	src/PeerPoint.cpp

*Merging conflict with Ritchie and Ben
Merge branch 'master' of https://github.com/jbang0317/PeerPoint.git

Conflicts:
	src/PeerPoint.cpp

	Merge again?