sef
Merge branch 'master' of https://github.com/kvajapey/Mobile_Lab4_Kiran_Alex

Conflicts:
	TrackIt/bin/TrackIt.apk
	TrackIt/bin/classes.dex