rm
readme
Merge branch 'dev'

Conflicts:
	readme.txt