...
Merge branch 'master' of https://github.com/interactivenotes/inotes

Conflicts:
	.gitignore