Merge pull request #5 from JeremyKooper/master

changed death condition
added tags to portals for plasma turret