fixed merge
Merge branch 'master' of https://github.com/rdallman/flaming-wookie
Merge pull request #16 from roberthorn/master

added initial dashboard stuff