add text
dev info
add dev message 2
Merge branch 'develop'

Conflicts:
	README.md