remove nbproject folder
Merge branch 'master' of https://github.com/amerharb/HKR_Football

Conflicts:
	nbproject/private/private.xml
Merge branch 'master' of https://github.com/amerharb/HKR_Football

Conflicts:
	nbproject/private/private.xml