Fixed merge issues
Saved changes to colors in templates directory
Merge branch 'master' of https://github.com/alienresident/compass-pattern-primer