Usability
Merge branch 'master' of https://github.com/Psaiken/Oblig_4

Conflicts:
	Project1/Sone.cpp