add ignore settings file.
Merge branch 'develop'

Conflicts:
	.gitignore
add videos controller