Merge branch 'branch/nate' into branch/Geoff
Adding varied square size classes
make grid 21x21
Merge branch 'branch/Geoff' of github.com:mightyhops/nulam into branch/nate

Conflicts:
	public/stylesheets/style.css
Merge branch 'branch/Geoff' of github.com:mightyhops/nulam into branch/nate

Conflicts:
	public/stylesheets/style.css