Big giant button. And fixes #15
merge
Merge branch 'master' of https://github.com/rit-sse/crazy-train