Delete THIS_IS_A_TEST.txt

do not need dis file. it is waste of space. haaaaaaaaaaaaaaaands
Added the UML we put together
Working on Line of Sight and had to make some modifications to PlayerUnits.
Big square calculations are done, but finer pythagorean calcs are not yet done.
Merge branch 'master' of https://github.com/CSc436/Project-4x into dev
Merge branch 'dev' of https://github.com/CSc436/Project-4x into dev
rough terrain adjustment implemented. Think I still need to account for
diagonals that cause issues, etc.
Loading Screen!
Merge branch 'dev' of https://github.com/CSc436/Project-4x.git into dev
Added Tile transition adjustment. Should allow current tile set to work
better with a map. still need to fix the diagonal issue.
Did diagonal analysis, I think it meets all the necessary requirements
for the tiling. for a 500x500 map it looks good, and takes very little
time to set up the whole map.
Merge pull request #28 from CSc436/MapUniformity

Map uniformity
Resource icons
Merge branch 'dev' of https://github.com/CSc436/Project-4x.git into dev
Finished LOS code, merging locally so I can resolve errors. Not sure about testing...
Merge branch 'board-los' into dev

Conflicts:
	DUMB.png
	war/game/compilation-mappings.txt
	war/game/game.nocache.js
Merge branch 'dev' of https://github.com/CSc436/Project-4x.git into dev
Merge branch 'research' into merge

Conflicts:
	src/control/GameModel.java