Got json info for morris.js....maybe
Merge branch 'master' into alyssa
Finished getting json working with morris.js
Merge branch 'master' into alyssa
working on ajax for moments ticker on dashboard
trying to add modified files for commit
Merge branch 'master' into jason

Conflicts:
	app/controllers/pages_controller.rb
	app/views/pages/dashboard.html.erb