some addons
Merge branch 'master' of github.com:ongwle/mProject

Conflicts:
	index.html
	js/.DS_Store
merge index.html
merge