Added pvp.userprefs to .gitignore
Merge branch 'master' of https://github.com/pimms/agameofplanets
Added stuff to .gitignore