Merge pull request #1 from lyDASHsBOK/master

mtake
t
t
Merge commits 'refs/pull/3/head', 'refs/pull/4/head', 'refs/pull/5/head' and 'refs/pull/7/head' of https://github.com/lyDASHsBOK/NYP-HTML5; branches 'master' and 'master' of https://github.com/winstonho/NYP-HTML5