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
Small changes
Movement
moving
small changes
Merge branch 'master' of local repository into LiangMummy

Conflicts:
	src/creatures/Mummy.java
Movement
Merge branch 'master' of local repository into LiangMummy
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 possible location list population within the PowerUp Manager class
fixed minor errors from merging
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git
Making mummy nnot move out of bounds
Tweaks to Abstract (some private classes made public), HPHeal works but
is not being drawn