Merge pull request #2 from cuberis/master

unifying dev from master
css updates
Merge branch 'master' of https://github.com/cuberis/responsive-html into dev
Merge branch 'dev' of https://github.com/cuberis/responsive-html into dev

Trying to resolve fast-forward conflict
cleaned up jade file
transitions refined, more or less
input pseudoelements tweaked
slides standardized
test iframe refined
test iframe refined further
iframes are at a good place
subcontent feature complete. LESS mixins added
Merge pull request #5 from cuberis/feature-subcontent

subcontent feature complete. LESS mixins added
style tweaks
Merge branch 'dev' of https://github.com/cuberis/responsive-html into dev

Fixing fast-forward
colors updated
graphic for slide 4 finished
vertically centered
graphic for slide 10 finished
graphic for slide 10 finished