adding changes
Merge branch 'master' of https://github.com/jgensler8/tempProj

Conflicts:
	SkyGraph/src/SkyGraph/Workspace.java