Ignore .DS_Store files
Rails 4 doesn't use asset group anymore
Frontend working with geocities bootstrap
Merge fix