added a comment to main.cpp to test git
Merge branch 'test' into eric

Conflicts:
	main.cpp
Merge branch 'eric' of https://github.com/A00841554/GrapefruitProtocol into eric

Conflicts:
	main.cpp