.
userprefs in gitignore
Merge branch 'master' of github.com:402PaymentRequired/FreezingArcher