COBALT-CLERIC/COBALT-CLERIC — pull request #72 by Kdr18702 (2014-12-08 18:22:04+00:00)
Title: Merge remote-tracking branch 'origin/Iss67'

Conflicts:
server/requests.js