Everything since design w/ unit tests
Merge branch 'master' of https://github.com/ouncooper/Project-3

Conflicts:
	Author.java
	Graph.java