add new file
Merge branch 'master' of https://github.com/githubteacher/wjax2013
Merge branch 'master' of https://github.com/githubteacher/wjax2013