First commit with most of the codebase in place
Merge pull request #1 from js21/master

First commit with most of the codebase in place