initial commit
Merge branch 'master' of https://github.com/John213/fitweb

Conflicts:
	.gitignore