Pre merge
Merge branch 'master' of https://github.com/SweedJesus/OOPS-P1-Pointer-Power

Conflicts:
	src/main.cpp