first commit
second commit
ok
wq
first commit
second commit
ok
wq
Change 1
Change 2
Merge branch 'nickyjaspers-feature1' of https://github.com/nickyjaspers/hellogitworld into nickyjaspers-feature1

Conflicts:
	firstfile.txt
added
dus
Merge branch 'nickyjaspers-feature1'