New Commit
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
added map on overview
added map and merged with upstream
edited Map Tab
New DB
Merge branch 'Trip_Planner_DB' of https://github.com/juwujaren3/CS2340Servlet
Merge branch 'Trip_Planner_DB' of https://github.com/juwujaren3/CS2340Servlet into validationOperations
Need to set up SQL to work with Tomcat
Merging SQL
Merging database.
Successfully merged account login/create/update with MySQL DB.