initial commit
Merge branch 'master' of github.com:noahfx/github_ss1