Merge pull request #31 from MarkTonkinson/master

To do is functioning :)
displays
getuser fixes
css on the login
merge fix
Merge pull request #32 from kweek/master

displays