Fixed merge conflict
Fixed another merge conflict yay
Merge pull request #3 from cs27x/impl/taylor_beck/christian_reynolds/group1

Impl/taylor beck/christian reynolds/group1
removing conflict
fixed bracket errors
Merging group1_master into group0_master
Merging group1_master into group0_master
Merge branch 'group3_master' into group0_master

Conflicts:
	in-class-2/src/main/java/org/magnum/cs278/testdriven/App.java
	in-class-2/src/test/java/org/magnum/cs278/testdriven/AppTest.java
Made the method reusable to generate number of events passed than being
specific for only 3 events.
Merging pull request from Monica Hedda