created landing page
changed the database"
removed databse yml form git ignore"
fixed merging conflicts
Merge branch 'master' of github.com:SandyLudosky/SafeHaven