testing on phone
Merge branch 'master' of https://github.com/Raymondd/smartest

Conflicts:
	.DS_Store