minor fixes
added assets dir
added custom modernizr
fix diff
fix mergetool wrong execution
Merge branch 'gh-pages' of https://github.com/dpaez/iadm_demo into gh-pages