* Start to hack
Merge branch 'master' of github.com:jayzeng/emberfun

Conflicts:
	README.md