In the beginning...
I guess I need to add this file too
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore