CS3283-CodeCraft/CodeCraft — pull request #35 by angathorion (2014-11-14 14:59:46+00:00)
Title: Daniel rebase

@tripled2002 @undisputed-seraphim this merges commit ea8104d. Please rebase