Commit All
Merge branch 'master' of https://github.com/benjaminbacon/BaconProjects

Conflicts:
	mingle.v2
commit
	modified:   mingle.v2
	modified:   mingle.v2 (modified content)