metachris/metalab-git-workshop — pull request #6 by luto (2014-05-17 10:55:01+00:00)
Title: add note about git lol

Oh noes, a conflict!
Just in case you need one.