Init project.
Merge branch 'master' of github.com:desireRoom/ConvictConditioningManual

Conflicts:
	.gitignore