.gitignore .idea
Merge branch 'master' of https://github.com/dejno/On-Behalf

Conflicts:
	.gitignore