Can't believe I hadn't saved this yet.
Merge branch 'master' of github.com:bwinterling/idea_box