Integrating Ocean client with Flask
Merge branch 'master' of github.com:Adjective-Object/ocean-irc

Conflicts:
	localserver.py
Merge branch 'master' of github.com:Adjective-Object/ocean-irc

Conflicts:
	localserver.py
	static/client.html
Merge branch 'master' of github.com:Adjective-Object/ocean-irc
Prepending # to outgoing message channels
Merge branch 'master' of github.com:Adjective-Object/ocean-irc