App skeleton
Merge branch 'master' of github.com:sunxin8086/gymotivate-android

Conflicts:
	.gitignore