Added ignores
Merge branch 'master' into optus

* master:
  Added ignores

Conflicts:
	.gitignore