No idea what I was doing before, but I need a clean commit state.
just playing
tests
testing!
new awesome file
Merge branch 'master' of github.com:abztrakt/git-practice

Conflicts:
	haha.html
Merge remote-tracking branch 'origin/new_branch'

Conflicts:
	haha.html
	hello.txt