join ui
join modified
Merge branch 'master' of github.com:Windrunnner/what-dose-the-board-say

Conflicts:
	bin/classes/com/example/whatdosetheboardsay/Server.class
	gen/com/example/whatdosetheboardsay/R.java