computer.h and computer.cpp made (still some bugs)
Merge branch 'master' of https://github.com/Tagl/Verklegt2014

Conflicts:
	Verklegt2014/PersonRepository.cpp