Test commit

Testing from Sylar's laptop
Test commit

Removed comments
Merge branch 'master' of https://github.com/moriarty82/RainCheque into moriarty82-master

Conflicts:
	src/com/xteam/raincheque/ControlBoardActivity.java