Initial commit
Merge remote-tracking branch 'origin/second'

Conflicts:
	.gitignore