Revert Commit
Merge branch 'master' of https://github.com/hugomarin/ArtNation

Conflicts:
	.DS_Store
	.sass-cache/167dbc5c9a01225882b607b13921643e3f0a4369/foundation.scssc

.sass-cache/7f14561b416a7b887afc43be51cd0d2100189c3a/_button-groups.scss
c
	.sass-cache/7f14561b416a7b887afc43be51cd0d2100189c3a/_buttons.scssc

.sass-cache/7f14561b416a7b887afc43be51cd0d2100189c3a/_custom-forms.scssc
	.sass-cache/7f14561b416a7b887afc43be51cd0d2100189c3a/_grid-5.scssc
	.sass-cache/7f14561b416a7b887afc43be51cd0d2100189c3a/_grid.scssc
	assets/.DS_Store
	assets/css/app.css
	assets/css/app.min.css
	assets/css/foundation.css
	assets/css/foundation.min.css
	assets/scss/.DS_Store
	assets/scss/foundation/.DS_Store
	assets/scss/foundation/components/.DS_Store
	templates/.DS_Store