initial
Merge branch 'master' of github.com:janza/membrain

Conflicts:
	.gitignore