Axmill/The_Mishmash — pull request #1 by Axmill (2014-10-24 21:50:04+00:00)
Title: The Aesthetically Pleasing Update (v0.25)

MERGE THESE BRANCHES.