second commit
Merge branch 'develop'

Conflicts:
	Readme.txt