private.xml changed
Merge branch 'master' of https://github.com/ColinZeidler/GameNow

Conflicts:
	nbproject/private/private.xml