grid funs
Merge branch 'master' of https://github.com/abstractidea/7th-floor

Conflicts:
	src/misc/Grid.js

blueberry waffle