finished packaging conf
finished packaging conf
updating git ignore
Merge pull request #10 from joshhoegen/feature/conf2

Feature/conf2