Adam added a file
Hi it is me
conflicts fixed