With locations

TODO:
    - locks
Merge branch 'master' of https://github.com/liammann/JavaCoursework

Conflicts:
	Java Version/LocationTest.java