octocat
Merge branch 'gh-pages' of https://github.com/KonradIT/HeroProApp into gh-pages

Conflicts:
	README.md