Combat now working

- Able to kill other units
- Game can end
- Improved terrain generator
- Added two more terrain generations
- Implemented Teams