default to production in master
Merge commit 'b068c7e764'
pulled in render_show fix from develop
updated gitignore
added Gemfile.lock
mysql2 default in Gemfile
merged in latest from develop
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
fixed name cascading bug
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Update app/mailers/mailer.rb

corrected missing '>' that caused mailer error
Merge branch 'develop'
Merge pull request #27 from mike14495/master

BUG FIX FOR MAILER ERROR PROBLEM
Merge branch 'develop'