r3

Signed-off-by: binhdocco <binhjustin123@gmail.com>
Merge branch 'code' of https://github.com/misafamily/msss into code

Conflicts:
	app.js

Signed-off-by: binhdocco <binhjustin123@gmail.com>