Initial commit before starting
Merge conflicts resolved; initial project commit