Fixed event parser to handle C style comments.
Merge remote-tracking branch 'origin/tmcs_kyle' into tmcs_kyle

Conflicts:
	TrainManagementControlSystem/src/org/csu/cs517/tmcs/events/EventParser.java
Fixing merge