First attempt
updates
added mixins
Victorpush
Merge pull request #1 from aisflat439/aisflat439_branch

Aisflat439 branch