added
changed
changed again
new
Merge remote-tracking branch 'upstream/master'

Conflicts:
	newfile.txt
Create blabbers.txt
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from xzero12/master

First pull request