Removed .project file and added '.project' to .gitignore
Added ptrax.css to .gitignore
Saved work
Fixed merge conflicts