CSS Conflict
Merge branch 'master' of https://github.com/nathanielasare/generationflux
Class Logic Implementation