basic
git ignore
Merge pull request #2 from sparksm/master

stuff