Final To Do List
Merge branch 'master' of https://github.com/cwcraigo/TicWatch

Conflicts:
.DS_Store
Merge branch 'master' of https://github.com/cwcraigo/TicWatch

Conflicts:
	.DS_Store