added my preferences :)
Merge branch 'refs/heads/master' into anneza

Conflicts:
	README.md
Merge pull request #13 from theodi/anneza

added my preferences :)