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

Conflicts:
	google/credentials.dat
Merge branch 'master' into develop

Conflicts:
	google/credentials.dat