change .gitignore
Merge branch 'master' of https://github.com/pixelslip/pencil.js

Conflicts:
	.gitignore