deploy.rb changed
Merge branch 'dev'

Conflicts:
	public/500.html
enable ssl
Merge branch 'dev' of github.com:swytman/swytchat into dev
Merge branch 'dev'
Merge branch 'dev'
Merge pull request #25 from swytman/master

123