updated gitignore
more work on google API
Merge branch 'master' of github.com:jmagic/calres

Conflicts:
	google/credentials.dat