getting stuff done
updated .gitignore
bleh
Merge pull request #1 from somejedi/dev

boom