Merge branch 'master' of github.com:cgag/quickstyle

Conflicts:
	README.md