Merge pull request #14 from JamOORev/develop

Add history to JamCraft, Promote Candi to Admin
Changed Admin stuff.
Added Kroostmas Elves to list

Comp, me, Glassie, sci, and Mort are elves.
Merge pull request #1 from Mitchellbrine/master

Whoops, I made a mistake
Merge pull request #18 from Mitchellbrine/develop

Added Kroostmas Elves to list