merge css/main.css changes back into sass/*