Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/cs2114/ninjaassassin/graph/Edge.class