fewre
Merge branch 'master' of https://github.com/SGordon94/CS2334Project2.git
Merge branch 'master' of https://github.com/SGordon94/CS2334Project2.git
stuff
Merge branch 'master' of https://github.com/SGordon94/CS2334Project2.git

Conflicts:
	Project2_CS2334/src/ConferencePaper.java
	Project2_CS2334/src/JournalPaper.java