Fixed some problems... hopefully...
Fixed some problems... hopefully...
Merge branch 'guiwork' of https://github.com/Zalgo2462/ExtempFiller

Conflicts:
	src/com/chs/extemp/gui/ActionButton.java
Merge branch 'guiwork' of https://github.com/Zalgo2462/ExtempFiller
Fixed a few random errors.
Made the new code JDK6 compatible.
Fixed merge conflicts.