add meta viewport tag, d'oh
fix merge conflicts
Merge branch 'gh-pages' of github.com:tef/computer into gh-pages
add viewport or something