Initial Commit with project files
Merge conflicts resolved