number of users on there
commenting out stuff
Merge branch 'develop' into jeff-develop

* develop:
  fixed number of users thing
  fixed error with new chats not working
  removing offending code
  removed 'add time' thing
  added semicolons
  better URL linking
  removing the whole thing where is prints the users to the console
  added number of users
  sample of getting data to template
  chat now button

Conflicts:
	client/routes/chatRoute.js
adding notifications of new messages
comment out console.log
fixed merge
Merge branch 'develop' of https://github.com/jeffreybaird/clink into develop
Merge branch 'develop' into jeff-develop

* develop:
  comment out console.log
  adding notifications of new messages

Conflicts:
	client/routes/chatRoute.js
Prompt anonymous users for their name
autoscroll
autoscroll tweak
Display # of users online
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink into jeff-develop

# By Amy Langill
# Via Amy Langill
* 'jeff-develop' of https://github.com/jeffreybaird/clink:
  Prompt anonymous users for their name
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink into jeff-develop

# By Amy Langill
# Via Amy Langill
* 'jeff-develop' of https://github.com/jeffreybaird/clink:
  Display # of users online
one more tweak
staging site