* Yes
Merge branch 'master' of github.com:Dacilndak/eventreg
Merge branch 'master' of github.com:Dacilndak/eventreg
* Execjs.  It said it needed a JS RTE.

Conflicts:
	Gemfile