UI update
Merge branch 'master' of https://github.com/slown1/XamarinFitness

Conflicts:
	.gitignore