Changed the name of variables in Encounter
Fixed changes to MainController.
Trying to merge my commit
Moved dialog package to correct location
Merged with Seth's changes
Merged with Seth's changes
Revert "Merged with Seth's changes"

This reverts commit f172063f0ec46802597f708b074e177206867d52.
Merge branch 'master' of https://github.com/nkarusala/CS-2340-Fall-2014