merging two rogue branches
syncing rogue branches
Merge branch 'master' of https://github.com/Declan-Murphy/Group6/

Conflicts:
	Copy of org.dt340a.group6.sprint1/WebContent/WEB-INF/classes/.gitignore
git ignore updated to not take .class files