Merge branch 'master' of https://github.com/vuadoc/BigHero

Conflicts:
	README.md