Readme and gitignore
Merge branch 'master' of github.com:nicolasstucki/specialized

Conflicts:
	README.md