even more uml
Merge branch 'master' of https://github.com/cwcraigo/TicWatch

Conflicts:
	.DS_Store