Changed .gitignore
Merge branch 'master' of https://github.com/Kellerdach/BNT

Conflicts:
	.idea/workspace.xml