#merging and resolving conflicts.

this repo was used to practice the merging of a pull request when there is a conflict.

##how to view. go to coommit history to see hwo were diff braches added and how were there conflicts resolved.

##names i couldnt find anyone so had to do it alone. sorry:)