Update .gitignore. Migrated Isotope class from old code
Merged conflicts in .gitignore