just about done with the sell tile
fixed conflics, recommiting
Merge branch 'master' of https://github.com/umass-cs-326/team-jmash