Importing gitdemo project
Merge github.com:Forrestjohnston/gitdemo