First commit, adding latest config files from before the project start
Merge