Epihedron/Adventurer — pull request #31 by zerske (2014-02-26 03:42:24+00:00)
Title: conflict resolution - akdesign with alpha index.html

Went through an manually resolved all the merge errors between master and origin/master. Attempting another pull request for akdesign into master.