Merge seek_new/master

Conflicts:
	.gitignore