merge commit
Merge branch 'master' of https://github.com/HypnoBeaverMoose/SEA

Conflicts:
	PlantGeneratorGUI/PlantGeneratorGUI/Makefile
	PlantGeneratorGUI/PlantGeneratorGUI/MaskedButton.obj
	PlantGeneratorGUI/PlantGeneratorGUI/PlantGenGUI.cpp
	PlantGeneratorGUI/PlantGeneratorGUI/PlantGenGUI.obj
	PlantGeneratorGUI/PlantGeneratorGUI/PlantGeneratorGUI.pro
	PlantGeneratorGUI/PlantGeneratorGUI/PlantGeneratorGUI.pro.user
	PlantGeneratorGUI/PlantGeneratorGUI/SwitchWindow.obj
	PlantGeneratorGUI/PlantGeneratorGUI/android/.classpath
	PlantGeneratorGUI/PlantGeneratorGUI/android/AndroidManifest.xml
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/AndroidManifest.xml
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/AndroidManifest.xml.d
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/QtActivity.apk
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes.dex
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/.gitignore
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/R.java.d
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/kde/necessitas/ministro/IMinistro.java.d
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/kde/necessitas/ministro/IMinistroCallback.java.d
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/NFCStation.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$1.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$2$1$1.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$2$1.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$2.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$3.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$4.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$5.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$6.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$7.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$CloseTask.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$OpenTask.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$PowerParams.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$PowerResult.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity$PowerTask.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/classes/org/qtproject/qt5/android/bindings/QtActivity.class
	PlantGeneratorGUI/PlantGeneratorGUI/android/bin/resources.ap_
	PlantGeneratorGUI/PlantGeneratorGUI/android/gen/.gitignore
	PlantGeneratorGUI/PlantGeneratorGUI/android/gen/R.java.d
	PlantGeneratorGUI/PlantGeneratorGUI/android/gen/org/kde/necessitas/ministro/IMinistro.java
	PlantGeneratorGUI/PlantGeneratorGUI/android/gen/org/kde/necessitas/ministro/IMinistro.java.d
	PlantGeneratorGUI/PlantGeneratorGUI/android/gen/org/kde/necessitas/ministro/IMinistroCallback.java
	PlantGeneratorGUI/PlantGeneratorGUI/android/gen/org/kde/necessitas/ministro/IMinistroCallback.java.d
	PlantGeneratorGUI/PlantGeneratorGUI/android/libs/armeabi-v7a/gdbserver
	PlantGeneratorGUI/PlantGeneratorGUI/android/libs/armeabi-v7a/libPlantGeneratorGUI.so
	PlantGeneratorGUI/PlantGeneratorGUI/android/libs/armeabi-v7a/libgnustl_shared.so
	PlantGeneratorGUI/PlantGeneratorGUI/android/local.properties
	PlantGeneratorGUI/PlantGeneratorGUI/libPlantGeneratorGUI.so
	PlantGeneratorGUI/PlantGeneratorGUI/main.obj
	PlantGeneratorGUI/PlantGeneratorGUI/moc_PlantGenGUI.obj
	PlantGeneratorGUI/PlantGeneratorGUI/moc_SwitchWindow.obj
	PlantGeneratorGUI/PlantGeneratorGUI/qrc_resources.cpp
	PlantGeneratorGUI/PlantGeneratorGUI/qrc_resources.obj
	PlantGeneratorGUI/PlantGeneratorGUI/ui_PlantGenGUI.h
added code for LEDs and beeper to pokedex program
updated plantgen gui