Merge pull request #7 from benfalk/master

big merge
finished building out nre UI, added pops and hooked up a bunch of stuff
added guest user but its not quite finished
Merge pull request #10 from bpotterbaum/master

A few updates