Delete conflicting files
Merge branch 'master' of https://github.com/AirDisa/RailsSEO