THIS is the important commit

resolving some sync issues
Merge branch 'sync_issues'
Merge branch 'master' of https://github.com/jakestambaugh/CS401

Conflicts:
	Assig3/src/Assig3.java