Initial commit
Merge branch 'master' of github.com:jameswong/CrossFit

Conflicts:
	.gitignore