Consolidated scripts into main.R
Tidying up some merge problems
Merge branch 'master' of https://github.com/boubre/CSC4444_Project

Conflicts:
	slides/projectSlides.pdf
	slides/projectSlides.tex