Updated the gitignore and some other shit
Adding a ton of jank
Merge branch 'master' into Camera