added attack status
merging from beta?
Merge branch 'master' of https://github.com/davzhou/Battleship

Conflicts:
	Battleship/src/com/me/battleship/Torpedo.java
conflict
added drag functionality
moved width and height into class
added some ships that look like targets and implemented drag
implemented location reset for ships
refactored rendering
refactored rendering
Merge remote-tracking branch 'origin/master' into beta