organized sass files and updated sass package
Merge branch 'master' of https://github.com/thebakeryio/waldo

Conflicts:
	.meteor/packages
	.meteor/versions
	client/styles/global.scss