it's alive! new ui in progress
New achievement Apprentice Author (Level 1)
New achievement Apprentice Merchant (Level 1)
merging with github init

ch 'upstream/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.