changed password in database yml file
Merge branch 'mar0914' of https://github.com/vemcg/PP2-CardStorming into mar0914