First commit into git, general setup.
Merge pull request #1 from sricher/master

First commit into git, general setup.