Changed the name of the project. Updated the tasks list
Merge branch 'master' of https://github.com/jooskim/TimeAndMotionStudy

Conflicts:
	uploadController.m