fix tried
Merge branch 'Nitjoo-master'

Conflicts:
	.gitignore
	.idea/workspace.xml

a