CRONOZ09/cronoz09.github.io — pull request #2 by CRONOZ09 (2014-06-03 16:46:43+00:00)
Title: Merge conflicts

Adding changes for merge conflicts