added several files and folders to gitignore
Merge branch 'master' of github.com:dragondagda/withoutplan