commit before pull
Merge branch 'master' of https://github.com/Vici37/CSCI562_sem_project

Conflicts:
	factovisers/factovisers.cpp