nananana
added .gitignore
added c.txt
more c.txt
more b.txt
more b.txt, but wrong
Merge branch 'feature1'

Conflicts:
	b.txt
more a.txt
Merge pull request #1 from petee-d/feature2

Feature2 merge