Changes
Change to ChangeLog.md
Changes
Merge branch 'master' of https://github.com/vwolfley/wickenburg_project

Conflicts:
	CHANGELOG.md