a
ff
f
Merge branch 'master' of https://github.com/sa2048/sa2048.github.io

Conflicts:
	index.html