Initial commit
Merge branch 'master' of github.com:aprea/adoration

Conflicts:
	README.md