Add message from dev branch
Add from master
Add message dev again
Merge branch 'dev'

Conflicts:
	README