Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git
added flamethrower model made on google sketchup to models
flamethrower compiled into java file, renamed to FlameThrowerWeapon, and
added to weapons
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git
fixed several errors from merging in weapons
edited laser gun and flamethrower
updated control of projectile weapons
fixed minor errors from merging
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git

Conflicts:
	src/weapons/BaseballBatWeapon.java
	src/weapons/LaserGunWeapon.java