Added New Modified Shot class
Added Missing Fixed Shot Class
Conflicts:
	src/model/Shot.java