Cleanup
Merge branch 'master' of github.com:johnhult/DataStrukt

Conflicts:
	src/Lab1.java