some test user stuff
Merge branch 'dev'
eh... dev is working for the most part so... might as well...
piss
Merge branch 'master' of github.com:claytin/pissnet into dev
Merge branch 'dev' of github.com:claytin/pissnet into dev