Add back canon middleware
Add new API endpoint for timeline
Added hashtags
Updating travis for heroku
Merge branch 'master' of github.com:Illinois-Founders/pulse
Updating Heroku API key for Travis
Split into panes
Merge branch 'master' of github.com:Illinois-Founders/pulse

* 'master' of github.com:Illinois-Founders/pulse:
  Updating Heroku API key for Travis
  Updating travis for heroku
Merge commit '45432eac20769c0b8227e1f5b7af72ca05aa1aff'

* commit '45432eac20769c0b8227e1f5b7af72ca05aa1aff':
  Added hashtags

Conflicts:
	app.js
Fix missing lodash.map
Fix tests
See if this works with travis
Fix beforeClose on main window
Fix stupid chat button style
Fix #31
Fix #31 for reals
Bump version for Travis