Version 0.0.1
       Added Scanner to Organize When to Display Area
       Renamed Dialog in Package area2 to Dialog2
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of /Users/jameshulsizer/Desktop/Survival at the Dance Party/Survival-at-the-Dance-Party with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/bamgames/survivalatthedanceparty/SADPMain.java
Version 0.0.1
       Added Dialog to AreaTwoDialog
                 --Added Main Outline
                 --Plans to do main content of AreaTwoDialog Tommorow