working on styling
fixing merge conflicts
Merge branch 'master' of github.com:theverything/four04kids