Test file
css changes and new terms page
Merge branch 'feature/feature-updates' into develop
Merge branch 'develop'
Merge branch 'master' into gh-pages