Initial commit for github
Merge conflict from github