Initial Commit
Merge Conflicts solved