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
repair join course bug
create token
Merge pull request #31 from TonySongling/master

create token
ignore parameters.yml
fixed
api url
api url
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance
lsacomit
Merge pull request #33 from lsa2127291/master

lsacommit
repair cover bug
nothing
Merge branch 'master' of https://github.com/TonySongling/Renaissance

Conflicts:
	src/Renaissance/WebBundle/Controller/CourseController.php
Merge branch 'master' of github.com:yoyoyohamapi/Reinaissance

Conflicts:
	app/config/parameters.yml
	src/Renaissance/CommonBundle/Resources/config/services.yml