Resolving conflicts...again

Also adding .css files to the git ignore since they are generated by the
server.