Merge branch 'stash_testing'
Merge branch 'master' of https://github.com/huther/personal_projects

Conflicts:
	NOTES_wizard_book.txt
Merge branch 'master' of https://github.com/huther/personal_projects