n
Merge branch 'master' of https://github.com/meshuamam/GeekCon-2013

Conflicts:
	client/android/BalanceGameActivity/src/com/gilbert/balancegame/BalanceGameActivity.java