wulala
master reademe
Merge branch 'iss11'

Conflicts:
	README