Yep
Merge branch 'master' of github.com:ptthiem/st_replica

Conflicts:
	.gitignore