Merge branch 'master' of github.com:cjld/Signal-SRT-project

Conflicts:
	.gitignore