Removed gitIgnore
Merge branch 'master' of https://github.com/askho/COMP1510

Conflicts:
	.gitignore
Git ignore