Merge branch 'master' of https://github.com/themollusk45/mugenblog
add database.yml to .gitignore