Merge pull request #21 from DennisMarcu/master

holy crap, sorry this is so late
made ailments prettier and more functional
Merge pull request #22 from AdamAxtmann/master

made ailments prettier and more functional
ailment index delete button
fixed column widths in ailments
beauty ailments
Merge remote-tracking branch 'upstream/master'
Fixing bug where /createphr redirects to root_url
reCaptcha
Mailer 1.0 setup
gemfile.lock change for production push
Merge remote-tracking branch 'upstream/master'
merging in from upstream/adding basic fitness controller
fitness
fitness
fitness
Merge pull request #23 from AdamAxtmann/master

Fitness Controller
allergies prettied up, also fixed an issue with new ailments look
migration file to add delete to allergy
changed button names to be more appropriate