merged in stuff
added task nav
Merge branch 'master' of https://github.com/attask/turbo-dubstep-robot