garemoko/learninglocker — pull request #17 by ryansmith94 (2014-09-22 09:14:41+00:00)
Title: Fixes merge conflicts (hopefully).

Try that @garemoko :+1: hopefully that works, I can't believe how picky Git is being about this request.