Initial git import
Merge branch 'master' of github.com:JohnBrainard/acra-cadabra

Conflicts:
	.gitignore
	README.md