added a calender button
calender is implemented and displays a particular users journal entries - need to fix calender month links
everything about the calendar works. now we just need to make sure that all journal entries that are created get date attribute sop that they can be updated in the calender...
journal entries are now being created with a date but eh the date format needs to be fixed.
The calender is full y funtional and now gets updated immediately with journals.
quick little fix to the javascript - it no longer does a million ajax requests per link click in the calendar
cleaned up all the merge conflicts. lets refactor soon.

Conflicts:
	app/assets/javascripts/journal.js
	app/assets/stylesheets/application.css.scss
	app/controllers/journal_entries_controller.rb
	app/views/journal_entries/index.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'calender-button'
Merge branch 'master' of https://github.com/christophwong/pony-with-ponytails