Update .gitignore
Merge branch 'workingbranch' of
https://github.com/BrianNgo/EvaluationApp.git into workingbranch

Conflicts:
	.classpath
	.gitignore