Moved some initialisation stuff out of the main loop and added a frame timer to the output showing how long each frame took to generate.
Merge branch 'master' of https://github.com/nrig837/cv-project

Conflicts:
	proj.cpp