Add git ignore for database.yml
Merge branch 'master' into a_and_a
Merge branch 'master' into a_and_a
Changed H1
Merge pull request #2 from CodeCoreYVR/a_and_a

Changed H1