stash
add max rect
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/js/app.js
Merge branch 'master' of github.com:jwu/atlas-editor