First file on this branch
Angry monkey
Another commit
Yet another one
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
Merge branch 'firstidea'