view and base chat func
yo
cool
Merge branch 'master' of heroku.com:infinite-bastion-8178

Conflicts:
	index.js
	package.json
woah
woha
Merge branch 'master' of heroku.com:infinite-bastion-8178

Conflicts:
	index.js
Merge branch 'master' of heroku.com:infinite-bastion-8178

Conflicts:
	index.js
yuy
yuy
yuy
yuy
yuy
yuy
work
work
cool
hi
ryan
Merge branch 'master' of heroku.com:infinite-bastion-8178
df
Conflicts:
	index.js
	package.json
	views/about.html
	views/chat.html
	views/index.html