Ignoring redundant files
Merge branch 'master' into dev-aaron

Conflicts:
	.gitignore