Initial commit
Initial wave of project infrastructure
Fixed Conflicts