Consolidated CSS files

put all our (not bootstrap) css into one file, nups.css and updated
htmls to reflect that change