undentified changes
merge
removed unneccessary templates, updated .gitignore, fixed config creating