moving css into it's own file
merge conflicts
merge conflicts