deleted:    src/Renaissance/CommonBundle/Resources/config/services.yml
	new file:   src/Renaissance/CommonBundle/Resources/config/services.yml
	modified:   src/Renaissance/CommonBundle/Resources/config/routing.yml
commit
newcommit
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance

Conflicts:
	.gitignore~
	src/Renaissance/CommonBundle/Resources/config/services.yml
lsacommit
mycommit
dddd
lsacomit
commit1
delete
delete
yes
123commit