Merge branch 'restart'

Conflicts:
	.gitignore
HMatrix exposed
python version of getch
Merge branch 'master' of https://github.com/pengumc/Pengu_Q-1

Conflicts:
	.gitignore