commit again
test
Merge branch 'master' of https://github.com/kvajapey/Mobile_Lab4_Kiran_Alex

Conflicts:
	TrackIt/bin/classes/com/productivity/trackit/AppInfo.class
	TrackIt/bin/classes/com/productivity/trackit/AppList.class
	TrackIt/bin/classes/com/productivity/trackit/AppUsageService.class