starting on task
Merge branch 'master' of https://github.com/TimmyHuang/Are_You_Done_Yet_v1.0.0

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/xcalboy11x/Are_You_Done_Yet_v1.0.0