tried to fix some problems with touch and small screens, working on my iphone 4 localhost
merge conflics with master
Add modernizr to this repo
Adding favicon to master branch
Merge branch 'master' into server