Commit
Merge branch 'master' of https://github.com/CarloMagno/FlaggerFight.git

Conflicts:
	FlaggerFight/src/com/us/flaggerfight/NetworkService.java
Fixed
Added info button
Added info button again