Initial project commit
Fixed merge conflicts.