this fixes git ignore
changes git ignore
reorders for git ignore
refactored
Merge pull request #52 from Zhang/master

merges refactor