moving things around
Merge branch 'master' of github.com:kristopolous/frustrometer