added testing
merging diff
merging branches
updated gemfile
fixing merge conflicts
updated gemfile for merge conflicts
fixed merge conflicts
updated application.html.erb
Completed exercises 3.1 and 3.2
Completed exercises 3.1 and 3.2
added guard
added minitest reporters
added full_title helper
merging master into branch
fixed merge conflicts