Initial Commit
Merging Github and local branch