f
g
Merge branch 'devv'

Conflicts:
	readme.txt