added stuff
Merge branch 'master' of https://github.com/githubteacher/wjax2013
Merge branch 'master' of https://github.com/githubteacher/wjax2013

Stuff.
Merge branch 'master' of https://github.com/githubteacher/wjax2013
Merge branch 'master' of https://github.com/githubteacher/wjax2013

Dings
Merge branch 'master' of https://github.com/githubteacher/wjax2013

Stuff