Ignore os x files and generated stylesheets
Merge branch 'master' of https://github.com/geoffbalasi/side-project

Conflicts:
	app/.DS_Store
	app/style/stylesheets/style.css

Removing sass-cache from version control