initial
Merge branch 'master_loc'

Conflicts:
	.gitignore