added basic responsive styling
styles update
fixed merge conflict
Merge branch 'master' of github.com:moov2/browser-wars