added web listener
added web listener
Merge pull request #42 from bdurkee/master

added web listener
line ending changes
Merge pull request #44 from yushan87/master

Some line ending changes
some merging errors