add screen.css with basic media queries addressing smartphones and tablets
fix a small bug regarding media queries
Merge branch 'master' into mediaQueries
reorganize basic styles and add some comments
Merge branch 'mediaQueries'

Conflicts:
	assets/css/scaffold.css
add .gitignore
Merge branch 'master' of github.com:jbossek/html.scaffold
remove some unnecessary stuff