Stuff
Merge branch 'master' of https://github.com/DylanWatt/Bon

Conflicts:
	log.txt
Merge branch 'master' of https://github.com/DylanWatt/Bon
Merge branch 'master' of https://github.com/DylanWatt/Bon