meet and greet attempts at fixing bug.  Added Ruby 2.1.2 to Gemfile
more controller work.  Show not yet working.
added ruby 2.1.2 to gemfile
minor changes to show to attempt to get routes to play
added show method from journal_entries to sample_phrases.  FINALLY fixed the bug.  JournalEntry.find_by(params[:id]) NOT (:id params[:id])
stash reverse
more work on cleaning up SamplePhrasesController, JournalEntriesController.  Used binding.pry to ensure it is working properly.  Looks like it is.
did a 'git stash clear'
remove binding.pry
added .round to average and changed p tag to h1 on show page on @average
Merge branch 'meetgreet'
changed find_by to find in show action on SamplePhrase controller