Worked on chart.
resolved merge conflict.
Merge branch 'master' into jason

Conflicts:
	app/views/pages/dashboard.html.erb
minor changes to dashboard, new methods in goal.rb
Fixed logout issue, changed dashboard to bar chart.
changed layout to except bar chart on dashboard and linechart on show, not working; limited moments ticker to 5 moments.
show page now shows line chart for that goal, also moved the edit | delete menu to the footer for show.