Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	src/.DS_Store
Merge origin/master