Added ds_store thingy.
Merge branch 'master' of github.com:DavidTruby/Sanguine
Merge branch 'collisions'
fixed update stuff.
Merged branch master
Merge branch 'collisions' of github.com:DavidTruby/Sanguine into Collisions