Added gitignore file
Merge pull request #1 from winnietong/websockets

Added gitignore file
Merge branch 'develop' into canvas

Conflicts:
	.gitignore