Better dialogs
final stuff
Prepare for assignment 7 -- some changes to help things work with tomcat
Merge pull request #16 from jcao219/master

prepare for a7