Signed-off-by: julius <juiusasinorobles@yahoo.com>
Merge branch 'master' of https://github.com/juliusasinorobles/SatinLangToMyLoveKo.git

Conflicts:
	resources/css/style.css

Signed-off-by: julius <juiusasinorobles@yahoo.com>