Eclipse is crap
Merge branch 'master' of https://github.com/JonathanHolland/COMP3702

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/Ass1/.indexes/e4/f2/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Ass1/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Ass1/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/16.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/454170249.index
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
Ignore metadata folder