added txt and out to gitignore
Merge branch 'no_templates' of https://github.com/clenart/221_A1 into no_templates
formatting