Get first full client-side test working (doesn't do anything yet)
Merge branch 'master' of github.com:jonathanmundy/weewikipaint

Conflicts:
	src/client/client.js