update gitignore
Merge branch 'master' of github.com:jrschumacher/modomo

Conflicts:
	.gitignore