document stylesheets
Merge branch 'master' of github.com:craigcoles/Platter

Conflicts:
	assets/stylesheets/application.css
	assets/stylesheets/application.scss