Updating 3 files

Conflicts:
	.gitignore