names

changed names in /Users/
deleted names

asod
Merge branch 'master' of https://github.com/emilhlauritsen/Qreeps-P2-Project

Conflicts:
	nbproject/private/private.properties
asd

asd