[FIX] rs-plugin
Merge branch 'master' of https://github.com/videogamearmy/gamejamon

Conflicts:
	app/index.html
	gulpfile.js