in x
Merge branch 'feature-x' into dev
Merge branch 'dev'
NEWEST DEV
New Master
NewMaste2withcmsfd
lfsdkja
really?
Merge branch 'dev' of github.com:hibooboo2/testingGitMerging into dev

Conflicts:
	README.md
	README.md~
Started x
Merge branch 'x' into dev
Merge pull request #1 from hibooboo2/dev

Dev
Now ine a new dev