heroku scss bug
creating all folders and subfolders before trying to upload a document
committing in order to catch up
Merge branch 'master' of heroku.com:fmi-cazare-new

Conflicts:
public/assets/application-2a0cf67b7f3b199786e2bdc59c5c17e3.js.gz
public/assets/manifest-808cb3d8ef495090e3e4a6fd5d811d10.json
Revert "Merge branch 'master' of heroku.com:fmi-cazare-new"

This reverts commit 9a815ac1e07ee85ba079c7c04c990a3d9f24d41f.
Revert 87d5970..8aeaff6

This rolls back to commit 87d59700f180d4b34935a5c6272a63a4fafb5e1b.
Pulling all the changes back.
Merge branch 'master' of heroku.com:fmi-cazare-new

Conflicts:
	app/assets/stylesheets/application.css
trying to fix css
tryharding
adding the precompiled assets to git. trying everything