ignore all publish profiles
Merge branch 'master' of https://github.com/COTB/k94warriors

Conflicts:
	.gitignore
Merge pull request #41 from paulirwin/master

Major cleanup of model code, add medications
Merge pull request #42 from paulirwin/master

Initial incomplete work on medication log
huge controller refactor
Merge remote-tracking branch 'upstream/master'