Updated gitIgnore
Merge branch 'master' of https://github.com/navx2810/AssignThreeTranslate

Conflicts:
	.gitignore