init the dev branch
bootstrap working
Merge branch 'dev'

Conflicts:
	README.md