committing only to pull leo's changes
forgot these from last commit
Merge branch 'master' of https://github.com/AndyMoreland/cs-244-project

Conflicts:
	gen-java/PBFT/CheckpointMessage.java
	gen-java/PBFT/CommitMessage.java
	src/main/java/server/PBFTCohortHandler.java
iml
Merge branch 'master' of https://github.com/AndyMoreland/cs-244-project
Merge branch 'susan_fighting_with_intellij' of https://github.com/AndyMoreland/cs-244-project
finishing my fight with intellij
Merge branch 'susan_fighting_with_intellij'
Merge branch 'master' of https://github.com/AndyMoreland/cs-244-project