0002: Commit1
0003: Commit2
0004: Commit3
Merge branch 'master' of https://github.com/MartinSvarrer/merging into 0001

Conflicts:
	README.md
0006: Fixed a bug