everything working. about to integrate
done
Merge branch 'master' of https://github.com/wharvey92/paintbrushhaptic
Merge branch 'master' of https://github.com/wharvey92/paintbrushhaptic
almost done