Image loading working
Merge branch 'master' of github.com:dylandrop/graphics-final-project

Conflicts:
	src/main.cpp