working with pure css
Merge branch 'master' into working_branch
working on media queries for different screen sizes
more css stuff
mergin with master
Merge branch 'master' into working_branch
working out a couple bugs
Merge branch 'master' into working_branch
pull request
two tests
resolve conflicts