updated stuff
Merge branch 'master' of github.com:zawzawzaw/dash
updated
updated