first new file
Some new edits

Longer message later
Renamed and improved hello world
added more text
Merge branch 'renaming'
more changes
added a gitignore
Added a Makefile
fixed a typo
Merge branch 'feature2'
Reflowing paragraph
Added some new text
Merge branch 'feature2'

Conflicts:
	README.md