Finalizing Aarons edits.  Updating documentation. Run Round Keys works. Run Round works.
Merge branch 'master' of https://github.com/amon41amarth/VisualAES

Conflicts:
	Documentation/html/annotated.html
	Documentation/html/classentropy_1_1_entropy-members.html
	Documentation/html/classentropy_1_1_entropy.html
	Documentation/html/classes.html
	Documentation/html/classsetup_1_1_build_exe-members.html
	Documentation/html/classsetup_1_1_build_exe.html
	Documentation/html/classsetup_1_1pygame2exe.html
	Documentation/html/classsimplegui2_1_1_history_point-members.html
	Documentation/html/classsimplegui2_1_1_history_point.html
	Documentation/html/classsimplegui2_1_1_main_scene-members.html
	Documentation/html/classsimplegui2_1_1_main_scene.html
	Documentation/html/classsimplegui3_1_1_history_point-members.html
	Documentation/html/classsimplegui3_1_1_history_point.html
	Documentation/html/classsimplegui3_1_1_main_scene-members.html
	Documentation/html/classsimplegui3_1_1_main_scene.html
	Documentation/html/classsimplegui_1_1_history_point-members.html
	Documentation/html/classsimplegui_1_1_history_point.html
	Documentation/html/classsimplegui_1_1_main_scene-members.html
	Documentation/html/classsimplegui_1_1_main_scene.html
	Documentation/html/classslowaes_1_1_a_e_s-members.html
	Documentation/html/classslowaes_1_1_a_e_s.html

	Documentation/html/classslowaes_1_1_a_e_s_mode_of_operation-members.html
	Documentation/html/classslowaes_1_1_a_e_s_mode_of_operation.html
	Documentation/html/functions.html
	Documentation/html/functions_func.html
	Documentation/html/functions_vars.html
	Documentation/html/hierarchy.html
	Documentation/html/index.html
	Documentation/html/md__r_e_a_d_m_e.html
	Documentation/html/pages.html
	Documentation/html/search/all_72.js
	Documentation/html/search/functions_72.js
	Documentation/latex/classentropy_1_1_entropy.pdf
	Documentation/latex/classsetup_1_1pygame2exe.pdf
	Documentation/latex/classsimplegui2_1_1_history_point.pdf
	Documentation/latex/classsimplegui2_1_1_main_scene.pdf
	Documentation/latex/classsimplegui3_1_1_history_point.pdf
	Documentation/latex/classsimplegui3_1_1_main_scene.pdf
	Documentation/latex/classsimplegui_1_1_history_point.pdf
	Documentation/latex/classsimplegui_1_1_main_scene.pdf
	Documentation/latex/classsimplegui_1_1_main_scene.tex
	Documentation/latex/classslowaes_1_1_a_e_s.pdf
	Documentation/latex/classslowaes_1_1_a_e_s_mode_of_operation.pdf
	Documentation/latex/refman.tex
	simplegui.py
Merge branch 'master' of https://github.com/amon41amarth/VisualAES

Conflicts:
	Documentation/html/annotated.html
	Documentation/html/classentropy_1_1_entropy-members.html
	Documentation/html/classentropy_1_1_entropy.html
	Documentation/html/classes.html
	Documentation/html/classsetup_1_1_build_exe-members.html
	Documentation/html/classsetup_1_1_build_exe.html
	Documentation/html/classsetup_1_1pygame2exe.html
	Documentation/html/classsimplegui2_1_1_history_point-members.html
	Documentation/html/classsimplegui2_1_1_history_point.html
	Documentation/html/classsimplegui2_1_1_main_scene-members.html
	Documentation/html/classsimplegui2_1_1_main_scene.html
	Documentation/html/classsimplegui3_1_1_history_point-members.html
	Documentation/html/classsimplegui3_1_1_history_point.html
	Documentation/html/classsimplegui3_1_1_main_scene-members.html
	Documentation/html/classsimplegui3_1_1_main_scene.html
	Documentation/html/classsimplegui_1_1_history_point-members.html
	Documentation/html/classsimplegui_1_1_history_point.html
	Documentation/html/classsimplegui_1_1_main_scene-members.html
	Documentation/html/classsimplegui_1_1_main_scene.html
	Documentation/html/classslowaes_1_1_a_e_s-members.html
	Documentation/html/classslowaes_1_1_a_e_s.html

	Documentation/html/classslowaes_1_1_a_e_s_mode_of_operation-members.html
	Documentation/html/classslowaes_1_1_a_e_s_mode_of_operation.html
	Documentation/html/functions.html
	Documentation/html/functions_func.html
	Documentation/html/functions_vars.html
	Documentation/html/hierarchy.html
	Documentation/html/index.html
	Documentation/html/md__r_e_a_d_m_e.html
	Documentation/html/pages.html
	Documentation/html/search/all_72.js
	Documentation/html/search/functions_72.js
	Documentation/latex/classentropy_1_1_entropy.pdf
	Documentation/latex/classsetup_1_1pygame2exe.pdf
	Documentation/latex/classsimplegui2_1_1_history_point.pdf
	Documentation/latex/classsimplegui2_1_1_main_scene.pdf
	Documentation/latex/classsimplegui3_1_1_history_point.pdf
	Documentation/latex/classsimplegui3_1_1_main_scene.pdf
	Documentation/latex/classsimplegui_1_1_history_point.pdf
	Documentation/latex/classsimplegui_1_1_main_scene.pdf
	Documentation/latex/classsimplegui_1_1_main_scene.tex
	Documentation/latex/classslowaes_1_1_a_e_s.pdf
	Documentation/latex/classslowaes_1_1_a_e_s_mode_of_operation.pdf
	Documentation/latex/refman.tex
	simplegui.py