adjusted .gitignore
finally got collisions working again
fixed velocity x stuff
lots of little refactors