ignore sass cache
Removing commit sass cache
Style buttons
Merge branch 'master' of https://github.com/worzy/crucible

Conflicts:
	public/assets/.sass-cache/4df91402ffd49f48b9aa9f1bd034422dec54c7be/style.scssc
Fix gitingore