Init
Merge branch 'master' of github.com:wridgers/zapp

Conflicts:
	.gitignore