Comment out main.css in order to test commit merge actions
Merge branch 'ui'
Override weird changes in master