Implemented task completition
Merge branch 'master' of https://github.com/lucazulian/code4playhackathon

Conflicts:
	code4playhackathonserver/app.js