Merge branch 'master' of rest

Conflicts:
	.gitignore