update
Merge branch 'new-interface' of https://github.com/pziegler/snowbrains into new-interface

Conflicts:
	.gitignore