# This is a combination of 2 commits.
# The first commit's message is:

cleaning up documentation, and porting to jekyll

# This is the 2nd commit message:

# This is a combination of 2 commits.
# The first commit's message is:

switched to non-min for now

# This is the 2nd commit message:

switched to non-min for now... Now
squash
merging conflicts