proper location for modernizr
Merge branch 'develop'