Initial commit
Merge branch 'master' of https://github.com/bpeicher/amphibian

Conflicts:
	.gitignore