got mixitup plugin to work
merge
cleaned up
merge
changed global.css
Merge pull request #2 from paulinele/task/mixitup

Task/mixitup