testing merge
Merge branch 'master' of github.com:nuadha/phdadm
Updated database.yml