Merge pull request #4 from lyDASHsBOK/master

Merge pull request #6 from winstonho/master
Merge pull request #5 from lyDASHsBOK/master

mearge
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
movement done
Revert "movement done"

This reverts commit 6558509b24b4eede133263948ef3d2a76a4185bd.
blueCreep
movement donev2
conflict