had to fix the dock issue
Merge branch 'master' of https://github.com/bsanders/softeng
added data to tiles