box constrains
 Merge branch 'master' of https://github.com/FinalProjectGerstein/FinalProjectFirst

Conflicts:
	lockfile.lck