update gitignore
Merge branch 'master' of https://github.com/engagelab/iObserveService

Conflicts:
	.idea/workspace.xml