Added support for .no-wrap
Merge branch 'master' of github.com:hash-bang/Shoelace

Conflicts:
	shoelace.css