modified:   .gitignore
	modified:   protected/modules/gong/assets/js/GLoader.js
Merge branch 'master' of https://github.com/lanmower/gong

Conflicts:
	.gitignore
	nbproject/private/private.xml
	deleted:    nbproject/private/private.xml
	.gitignore~