no message
Merge branch 'master' of https://github.com/dimster2013/newsimple

Conflicts:
	new version.txt