history section
Merge branch 'master' of https://github.com/thillsman/Allergies

Conflicts:
	main.wire