adding submodule 2

Signed-off-by: Steven Jackson <sjackson@sapient.com>
Merge branch 'master' of github.com:jacksinn/git-features

Signed-off-by: Steven Jackson <sjackson@sapient.com>

Conflicts:
	.gitmodules