change in master
change in dev
change in master again
Merge branch 'dev'

Conflicts:
	README.md