Final commit
Final commit
Final commit
Final commit
Merge origin/master

Conflicts:
	.gitignore