ignore mac files
Merge branch 'develop'

Conflicts:
	.gitignore
Merge branch 'develop'
deleted ignore.txt was my fail that this showed up
renaming to videbligo