stashing changes
Merge branch 'master' of github.com:aaltsys/doc-develop

Conflicts:
	3_learn/01_bash.rst
	3_learn/04_internal-commands.rst
	3_learn/09_lesson4.rst
	3_learn/index.rst
	_deploy
resetting git to head