My refactoring branch
Merge pull request #6 from cs27x/refactoring/alex_meyer/group0

My refactoring branch
My Refactoring
Merge pull request #8 from cs27x/refactoring/walton_seymour/group1

refactoring tests
Sounds good
Changed names to increase readability
resolved merge conflicts
Conflicts resolved, chris's refactoring
Merge pull request #18 from cs27x/refactoring/MingYang_Lu/group1

refactoring/MingYang_Lu/group1
Chris's revised refactoring
March events fixed
Changed names to increase readability
fixed case sensitive testing
Merge branch 'refactoring/ethan_dixius/group1' of https://github.com/cs27x/in-class-2 into refactoring/ethan_dixius/group1

Conflicts:
	in-class-2/src/main/java/org/magnum/cs278/testdriven/App.java
Fixed the getMarchEvents function for real
Merge pull request #10 from cs27x/refactoring/christian_reynolds/group1

Chris's Refactoring
second change
Merge pull request #35 from cs27x/refactoring/xiaochen_yang/group1

Refactoring/xiaochen yang/group1
Merge branch 'group1_master' into refactoring/will_pascucci/group1

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
	in-class-2/src/test/java/org/magnum/cs278/testdriven/EventsMar2014.java
removed conflict
Merge pull request #41 from cs27x/refactoring/will_pascucci/group1

Refactoring/will_pascucci/group1