read me
readme  old
Merge remote-tracking branch 'origin/master'

Conflicts:
	SLWapp/readme.txt