dd
commit1
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance

Conflicts:
	src/Renaissance/CommonBundle/Resources/config/services.yml
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance

Conflicts:
	src/Renaissance/CommonBundle/Resources/config/services.yml
	src/Renaissance/WebBundle/Resources/views/Course/index.html.twig
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance

Conflicts:
	app/config/parameters.yml
	src/Renaissance/CommonBundle/REST/Canvas/ModulesREST.php
	src/Renaissance/CommonBundle/Resources/config/services.yml
fixed
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance
lsacomit
Merge pull request #33 from lsa2127291/master

lsacommit