added the next check-in time
commit whatever
Merge branch 'master' of https://github.com/JohnPayment/TurboHipsterPhone

Conflicts:
	Code/Button2/build/compiled/Button2.class
	Code/Button2/build/compiled/Button2/Sender.class
	Code/Button2/build/compiled/Login/UI.class
	Code/Button2/build/compiled/Util/DATAMessageFormat
	Code/Button2/build/compiled/Util/English
	Code/Button2/build/compiled/Util/FileIO.class
	Code/Button2/build/compiled/Util/French
	Code/Button2/build/compiled/Util/Messages.class
	Code/Button2/build/preprocessed/Button2.java
	Code/Button2/build/preverified/Button2.class
	Code/Button2/build/preverified/Button2/Sender.class
	Code/Button2/build/preverified/Login/UI.class
	Code/Button2/build/preverified/Util/DATAMessageFormat
	Code/Button2/build/preverified/Util/English
	Code/Button2/build/preverified/Util/FileIO.class
	Code/Button2/build/preverified/Util/French
	Code/Button2/build/preverified/Util/Messages.class
	Code/Button2/build/preverifysrc/Button2.class
	Code/Button2/build/preverifysrc/Button2/Sender.class
	Code/Button2/build/preverifysrc/Login/UI.class
	Code/Button2/build/preverifysrc/Util/FileIO.class
	Code/Button2/build/preverifysrc/Util/Messages.class
	Code/Configurator/build/compiled/Button2/Sender.class
	Code/Configurator/build/compiled/Configurator/Configurator$SettingStruct.class
	Code/Configurator/build/compiled/Configurator/Configurator.class
	Code/Configurator/build/compiled/Configurator/Languages$LanguageListener.class
	Code/Configurator/build/compiled/Configurator/Languages.class
	Code/Configurator/build/compiled/Configurator/Login$LoginListener.class
	Code/Configurator/build/compiled/Configurator/Login.class
	Code/Configurator/build/compiled/Configurator/Settings$SettingListener.class
	Code/Configurator/build/compiled/Configurator/Settings.class
	Code/Configurator/build/compiled/Configurator/Toggleable.class
	Code/Configurator/build/compiled/Login/UI.class
	Code/Configurator/build/compiled/Util/DATAMessageFormat
	Code/Configurator/build/compiled/Util/English
	Code/Configurator/build/compiled/Util/FileIO.class
	Code/Configurator/build/compiled/Util/French
	Code/Configurator/build/compiled/Util/Messages.class
	Code/Configurator/build/preprocessed/Configurator/Configurator.java
	Code/Configurator/build/preprocessed/Configurator/Languages.java
	Code/Configurator/build/preprocessed/Configurator/Login.java
	Code/Configurator/build/preprocessed/Configurator/Settings.java
	Code/Configurator/build/preprocessed/Configurator/Toggleable.java
	Code/Configurator/build/preverified/Button2/Sender.class
	Code/Configurator/build/preverified/Configurator/Configurator$SettingStruct.class
	Code/Configurator/build/preverified/Configurator/Configurator.class
	Code/Configurator/build/preverified/Configurator/Languages$LanguageListener.class
	Code/Configurator/build/preverified/Configurator/Languages.class
	Code/Configurator/build/preverified/Configurator/Login$LoginListener.class
	Code/Configurator/build/preverified/Configurator/Login.class
	Code/Configurator/build/preverified/Configurator/Settings$SettingListener.class
	Code/Configurator/build/preverified/Configurator/Settings.class
	Code/Configurator/build/preverified/Configurator/Toggleable.class
	Code/Configurator/build/preverified/Login/UI.class
	Code/Configurator/build/preverified/Util/DATAMessageFormat
	Code/Configurator/build/preverified/Util/English
	Code/Configurator/build/preverified/Util/FileIO.class
	Code/Configurator/build/preverified/Util/French
	Code/Configurator/build/preverified/Util/Messages.class
	Code/Configurator/build/preverifysrc/Button2/Sender.class
	Code/Configurator/build/preverifysrc/Configurator/Configurator$SettingStruct.class
	Code/Configurator/build/preverifysrc/Configurator/Configurator.class
	Code/Configurator/build/preverifysrc/Configurator/Languages$LanguageListener.class
	Code/Configurator/build/preverifysrc/Configurator/Languages.class
	Code/Configurator/build/preverifysrc/Configurator/Login$LoginListener.class
	Code/Configurator/build/preverifysrc/Configurator/Login.class
	Code/Configurator/build/preverifysrc/Configurator/Settings$SettingListener.class
	Code/Configurator/build/preverifysrc/Configurator/Settings.class
	Code/Configurator/build/preverifysrc/Configurator/Toggleable.class
	Code/Configurator/build/preverifysrc/Login/UI.class
	Code/Configurator/build/preverifysrc/Util/FileIO.class
	Code/Configurator/build/preverifysrc/Util/Messages.class
	Code/Configurator/dist/Configurator.jad
	Code/Configurator/dist/Configurator.jar
	Code/TsunamiSolutionsLibrary/build/compiled/Button2/Sender.class
	Code/TsunamiSolutionsLibrary/build/compiled/Util/DATAMessageFormat
	Code/TsunamiSolutionsLibrary/build/compiled/Util/English
	Code/TsunamiSolutionsLibrary/build/compiled/Util/French
	Code/TsunamiSolutionsLibrary/build/compiled/Util/Messages.class
	Code/TsunamiSolutionsLibrary/build/preprocessed/Button2/Sender.java
	Code/TsunamiSolutionsLibrary/build/preprocessed/Util/DATAMessageFormat
	Code/TsunamiSolutionsLibrary/build/preprocessed/Util/English
	Code/TsunamiSolutionsLibrary/build/preprocessed/Util/French
	Code/TsunamiSolutionsLibrary/build/preprocessed/Util/Messages.java
	Code/TsunamiSolutionsLibrary/build/preverified/Button2/Sender.class
	Code/TsunamiSolutionsLibrary/build/preverified/Util/DATAMessageFormat
	Code/TsunamiSolutionsLibrary/build/preverified/Util/English
	Code/TsunamiSolutionsLibrary/build/preverified/Util/French
	Code/TsunamiSolutionsLibrary/build/preverified/Util/Messages.class
	Code/TsunamiSolutionsLibrary/build/preverifysrc/Button2/Sender.class
	Code/TsunamiSolutionsLibrary/build/preverifysrc/Util/Messages.class
	Code/TsunamiSolutionsLibrary/dist/TsunamiSolutionsLibrary.jad
	Code/TsunamiSolutionsLibrary/dist/TsunamiSolutionsLibrary.jar