AJCStriker/Movecraft-3 — pull request #109 by msummers123 (2014-03-18 03:43:32+00:00)
Title: Test automatic merge, also bug fix for the sink settings and prepare structures for new features

The main point is to make sure automatic merging is working, or if I should re-fork