arlie

Signed-off-by: Kibon <kiboncheng@gmail.com>
]arlie 2

Signed-off-by: Kibon <kiboncheng@gmail.com>
Merge branch 'master' of github.com:NAUGHTY3/practice2

Conflicts:
	index.html

Signed-off-by: Kibon <kiboncheng@gmail.com>