Direcshuns
Merge branch 'master' of https://github.com/omichowdhury/rtl

Conflicts:
	src/js/example-controller.js