Setting up the Github Repo
solved small merging conflicts