Changes; still no working Caps section
Merge branch 'master' of https://github.com/mindaika/Assignment2

Conflicts:
	Assignment2/main.cpp