half done placeinfo
fixed merge conflict
updated info
Merge branch 'master' of github.com:vgupta0/cs147-final