The attack screen now works to an extent. Also ugly water is being drawn.
Merge branch 'CG'
Merge branch 'master' into CG
Merge branch 'CG' into Android-UI

Conflicts:
	Battleship/bin/Battleship.apk
	Battleship/bin/R.txt
	Battleship/bin/classes.dex
	Battleship/bin/classes/android/support/v7/appcompat/R$layout.class
	Battleship/bin/classes/com/example/battleship/MainActivity$1.class
	Battleship/bin/classes/com/example/battleship/MainActivity$Graph.class
	Battleship/bin/classes/com/example/battleship/MainActivity$Node.class
	Battleship/bin/classes/com/example/battleship/MainActivity$aView.class
	Battleship/bin/classes/com/example/battleship/MainActivity.class
	Battleship/bin/classes/com/example/battleship/R$drawable.class
	Battleship/bin/classes/com/example/battleship/R$id.class
	Battleship/bin/resources.ap_
	Battleship/gen/com/example/battleship/R.java
	Battleship/src/com/example/battleship/MainActivity.java