Signed-off-by: Tinh Nguyen <tinh@wiserobot.com>
Merge branch 'master' of https://github.com/tinhnd1988/website

Conflicts:
	test.txt

Signed-off-by: Tinh Nguyen <tinh@wiserobot.com>