My commit message
Merge branch 'develop' of https://github.com/admere/demo into develop

Conflicts:
	README.md
This is the final commit.
Merge pull request #2 from admere/5012-test

5012 test