First commit
Merge branch 'master' of https://github.com/maxdavidking/omeka2

Conflicts:
	README.md