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

Conflicts:
	nbproject/private/private.properties
something

something
123

123
1234

1234
21421

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