Initial commit of the example git repo files.
Added .gitignore rules and added a line to README.md file.
hello
asjksa
as
assa
Merge branch 'feature/newbla'
Added second sentence.
added a third line and correct the first.
Merge branch 'bla'.

Conflicts:
	README.md
Merge branch 'master' of https://github.com/kristoforcarlson/example

Conflicts:
	README.md