twerky twerky
Merge branch 'dev' into dev_AO
 fixed small stuff
merged
finished the energy torpedo