add header
more test
Merge branch 'develop'

Conflicts:
	README.md
fixed
This is in dev
This is a hot fix
Merge branch 'hotfix' into develop

Conflicts:
	bar.html