Merge branch 'master' of https://github.com/wiznuq/RunningCoach

Conflicts:
.gitignore
add

Conflicts:
	.gitignore
Update