Initial commit
Merge http://github.com/softsan/demo-git