metachris/metalab-git-workshop — pull request #34 by scriptythekid (2014-05-27 19:49:35+00:00)
Title: parent of all merges

merge all the branches