gitignore update
Merge branch 'master' of https://github.com/PhunkMaster/phonegap

Conflicts:
	.gitignore