ignore style.css add styling

Conflicts:
	assets/css/style.css
	assets/js/dist/main.min.js