Fixitfixitfixit
Merge branch 'master' of github.com:squashible/squashible