uncommited changes

i dont remember what i changed, but its probably important. here it is
line bug resolved

we got the line bug resolved
merged from iago

merged from iago to get his version of the game
whatever

ugh
merged from iago's branch

hopefully this will go through correctly
;b

.kfbgkweghijefth
aesthetic changes

swapped out some textures, improved how things look, fixed a null
reference issue