Revert "removal of compiled files in public/assets"

This reverts commit 65310269aea2a80c3bbe4cce9ef6e70b117b6e4b.
Revert "toying with bootstrap and sass"

This reverts commit 005f82c070d55ec17ac007a8b6fbd75f39f50340.
cached files removed fro public/assets and bootstrap overrides reinstated
fixed merge conflicts