wice_grid upgraded
ruby 2
Merge branch 'master' of github.com:leikind/wice_grid_testbed

Conflicts:
	Gemfile
	Gemfile.lock
wice grid upgraded