Initial commit
lorem ipsum
Merge remote-tracking branch 'origin/master'Conflicts:	.gitignore