adding in new styles
revised gitignore
Merge branch 'master' of github.com:macaroni92/MixFliks
adding sass styles
merging in styles
commit to daniel branch
commit
get json data needed filter non speaking parts
Merge branch 'master' into james