JoinActivityCreated
joinactivity
Merge branch 'master' of github.com:Windrunnner/what-dose-the-board-say

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/WhatDoseTheBoardSay.apk
	bin/classes/com/example/whatdosetheboardsay/MainActivity.class
	bin/classes/com/example/whatdosetheboardsay/R$layout.class
	bin/classes/com/example/whatdosetheboardsay/R$menu.class
	bin/classes/com/example/whatdosetheboardsay/R$string.class
	bin/classes/com/example/whatdosetheboardsay/R$style.class
	gen/com/example/whatdosetheboardsay/R.java