Fixed bug 3. Turns out it was a front on thing. Stupid me
Merge branch 'master' of https://github.com/woodbury/Musha