Merge pull request #2 from michaellee/gh-pages

merge gh to master
Initial commit
Merge branch 'master' of https://github.com/michaellee/nativehaus

Conflicts:
	CNAME
	index.html
Merge branch 'master' into gh-pages