modified:   config/database.yml
Landing Page Controller
Merge remote-tracking branch 'origin/master' into Auth