updated gitignore - no idea folder
Changed password to random uniq
Merge branch 'development'

Conflicts:
	.gitignore