file name change
some movement
Merge branch 'master' of https://github.com/hoonkong/thegrid

Conflicts:
	JS/block.js