Initial Commit of project
Fixing merges