Tiny Update (Credit Me)

Added a bit more to the credits to break the monotony.
Undo Redo

Don't know what went on there...
Merging Hell - The Commit

The entire repository is suffering conflict issues that are taking a bit of time to resolve.
If this goes well, I will try to restore the repository to its normal state.
Merging Hell - Finishing the merge...

Gopefully this doesn't break too much.
Merge branch 'master' of https://github.com/ctomni231/cwtactics

Conflicts:
	gameSrc/actions.js
	gameSrc/actions/attack.js
	gameSrc/actions/capture.js
	gameSrc/actions/commander.js
	gameSrc/actions/explode.js
	gameSrc/actions/factory.js
	gameSrc/actions/join.js
	gameSrc/actions/move.js
	gameSrc/actions/nextTurn.js
	gameSrc/actions/options.js
	gameSrc/actions/stealth.js
	gameSrc/actions/supply.js
	gameSrc/actions/transfer.js
	gameSrc/actions/transport.js
	gameSrc/actions/wait.js
	gameSrc/actions/weather.js
	gameSrc/ai.js
	gameSrc/ai/endTurn.js
	gameSrc/audio.js
	gameSrc/circularBuffer.js
	gameSrc/config.js
	gameSrc/constants.js
	gameSrc/cwScript.js
	gameSrc/dataTransfer/audio.js
	gameSrc/dataTransfer/config.js
	gameSrc/dataTransfer/image.js
	gameSrc/dataTransfer/maps.js
	gameSrc/dataTransfer/roundSetup.js
	gameSrc/dataTransfer/states.js
	gameSrc/functions.js
	gameSrc/image.js
	gameSrc/input.js
	gameSrc/input/gamepad.js
	gameSrc/input/keyboard.js
	gameSrc/input/mouse.js
	gameSrc/input/touch.js
	gameSrc/loading.js
	gameSrc/loading/audioInit.js
	gameSrc/loading/checkSystem.js
	gameSrc/loading/imageLoad.js
	gameSrc/loading/inputInit.js
	gameSrc/loading/language.js
	gameSrc/loading/loadMaps.js
	gameSrc/loading/loadMod.js
	gameSrc/loading/portraitCheck.js
	gameSrc/loading/startParameters.js
	gameSrc/localization.js
	gameSrc/logic/move.js
	gameSrc/logic/transport.js
	gameSrc/logic/turn.js
	gameSrc/logic/weather.js
	gameSrc/main.js
	gameSrc/matrix.js
	gameSrc/model.js
	gameSrc/network.js
	gameSrc/renderer.js
	gameSrc/renderer/animation.js
	gameSrc/renderer/cursor.js
	gameSrc/renderer/fog.js
	gameSrc/renderer/map.js
	gameSrc/renderer/menu.js
	gameSrc/renderer/unit.js
	gameSrc/rest/move_random.js
	gameSrc/sheets.js
	gameSrc/statemachine.js
	gameSrc/states/error.js
	gameSrc/states/ingame_anim_ballistic.js
	gameSrc/states/ingame_anim_captureProperty.js
	gameSrc/states/ingame_anim_changeWeather.js
	gameSrc/states/ingame_anim_destroyUnit.js
	gameSrc/states/ingame_anim_move.js
	gameSrc/states/ingame_anim_nextTurn.js
	gameSrc/states/ingame_anim_trapWait.js
	gameSrc/states/ingame_enter.js
	gameSrc/states/ingame_flush.js
	gameSrc/states/ingame_idle.js
	gameSrc/states/ingame_leave.js
	gameSrc/states/ingame_menu.js
	gameSrc/states/ingame_movepath.js
	gameSrc/states/ingame_multistep.js
	gameSrc/states/ingame_selecttile.js
	gameSrc/states/ingame_showAttackRange.js
	gameSrc/states/ingame_submenu.js
	gameSrc/states/ingame_targetselection_a.js
	gameSrc/states/ingame_targetselection_b.js
	gameSrc/states/menu_main.js
	gameSrc/states/menu_parameterSetup.js
	gameSrc/states/menu_playerSetup.js
	gameSrc/states/menu_versus.js
	gameSrc/states/options_confirmWipeOut.js
	gameSrc/states/options_main.js
	gameSrc/states/options_remap.js
	gameSrc/states/portrait.js
	gameSrc/states/start_load.js
	gameSrc/states/start_none.js
	gameSrc/states/start_tooltip.js
	gameSrc/systemFeatures.js
	gameSrc/tileVariants.js
	gulpfile.js
	modifications/cwt/misc/graphics.js
	modifications/cwt/misc/maps.js
	modifications/cwt/misc/minimap.js
	modifications/cwt/misc/musics.js
	modifications/cwt/misc/sounds.js
	modifications/cwt/misc/tooltips.js
	modifications/cwt/units/OOZM.js
	modifications/cwt/weathers/rain.js
	modifications/cwt/weathers/snow.js
	modifications/cwt/weathers/sun.js