Merge existing code into master
Pushed all existing code to git repo