This commit is done so i can do --no-ff
This merge is necessary because i am learning different features of git

in this commit i used merge with no fast forwarding to see the results