first meaningful commit
Merge branch 'master' of https://github.com/vzhar/dashboard