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

Conflicts:
	Input_Files/lazarillo_del_tormes.txt
	NOTES_wizard_book.txt