Small changes to behavior getting conflicts resolved. Also fixing
Buildings to work with constructor that was defined in dev branch. only
needed to do change because of rebase with dev
Merge branch 'behaviors' of https://github.com/CSc436/Project-4x.git into behaviors
Merge branch 'behaviors' of https://github.com/CSc436/Project-4x.git into behaviors
Getting rid of errors and conflicts so that branch is ready to be merged