downgraded version number (oups)
updated changelog
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
updated readme
added pref
added what's new info