git is the best that ever happened!
Added two files. Yes for sure! Both are in!
Merge branch 'firstidea' of github.com:nfredrik/helloword into firstidea

Conflicts:
	newfile.txt