Initial Import.
Merge branch 'master' of https://github.com/jmcgill-public/example-ws

Conflicts:
	.gitignore
gitignore update