rake db:migrate updated schema.rb
generated task checks_for_laziness.rake
Merge branch 'master' into jason
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
Merge branch 'master' into jason

Conflicts:
	app/views/pages/dashboard.html.erb
minor changes to dashboard, new methods in goal.rb