Majhong
Merge branch 'master' of https://github.com/nclsndr/algorithme_hetic

Conflicts:
	majhong/index.html
Merge branch 'master' of https://github.com/nclsndr/algorithme_hetic