Fonts
Merge branch 'master' of github.com:rocketu/group-project-base into develop
changed settings to our project
Merge branch 'develop' of github.com:mlee284045/sidebar into develop
Merge pull request #2 from mlee284045/mike

Mike