initial homepage commit
delete renamed files
resolve merge conflicts with Gemfile