ChristianDevs/CommunityGame2014 — pull request #9 by brandav (2014-11-05 23:05:36+00:00)
Title: Resolved merge conflicts

@murrayk012000 There are still some files that need to be ignored such as .csproj, sln, and userprefs

However, the conflicts have been resolved!