Init Commit Local
Init Commit Local
Init Commit Local
Merge origin/master

Conflicts:
	.gitignore