rails files
Merge https://github.com/playerzomb/blog