Merge pull request #22 from AdamAxtmann/master

made ailments prettier and more functional
Merge remote-tracking branch 'upstream/master'
Fixing bug where /createphr redirects to root_url
reCaptcha
Merge remote-tracking branch 'upstream/master'
merging in from upstream/adding basic fitness controller
fitness
fitness
fitness