preparing for css merge conflicts
Merge branch 'master' into styling-isotope
Merge branch 'master' into styling-isotope
correctly styled most icons
styled all isotope icons, fixed issue with not centering
fixed merge conflicts in seeds.rb
Merge pull request #63 from alangster/styling-isotope

Styling isotope
hide perfect button in ajax call
Perfect button works, fixed bug with condition view
Merge pull request #64 from alangster/style-article-show

Style article show
fixed a few stats, need to fix top percents
Merge pull request #65 from alangster/statistics-fixes

fixed a few stats, need to fix top percents
fixed outfit error message bug so that error message div only displays when there is indeed an error