Merge branch 'shift' into dev

FIxed Conflicts:
	.gitignore
	index.js