master' of https://github.com/brashrebel/client-dash

Conflicts:
readme.txt
Argh

Why you no work