correct gitignore
Merge branch 'master' of https://github.com/kensington133/pixl-gate

deleting ds_store

stuff#