JonasHazell/Demo — pull request #6 by JonasHazell (2014-03-18 15:34:04+00:00)
Title: Conflict test

@bodnerdan