recovered lost changes
Merge branch 'master' of https://github.com/GryfenCrypto/gryfenco.in-fatfree.git

Conflicts:
	ui/landing-content.html
	ui/learn-more.html

Signed-off-by: stefano <stefanofg@gmail.com>