Added boundaries check
Merge branch 'master' of https://github.com/s4275729/3702-Assignment2

Conflicts:
	src/tracker/TrackerTools.java