Subscribe to events OR add voice interaction
Merge branch 'master' of https://github.com/Cosmo/till-i-collapse

Conflicts:
	Rails/app/assets/stylesheets/application.css.sass