Initial commit
added .gitignore
merge for initial push to repo because I'm a git newb
trying to clean things up