Fixed merge issues, removing compiled css
Merge branch 'frontend' of https://github.com/ben336/Courage into frontend