footer files
merge conflicts
Ignore database.yml
Merge pull request #4 from calblueprint/charles-blog

footer files