trying to get a proper gitignore
Merge branch 'master' of github.com:interactivenotes/inotes

Conflicts:
	component.json