TheGoctor/The-Swordsman — pull request #1 by TheGoctor (2014-10-25 22:10:56+00:00)
Title: Merging from main

Merging Albert's initial setup changes.