ida's first update

Apologies for not updating about my work hitherto!

I've so far created classes for structuring how the plants, player, and npc will work in combat. i've also created a game time system, though we haven't implemented it in planting yet. Other than that, i've been taking care of Git issues, making sure things are merging correctly and working as they should. I also refined scripts and created some things to make sure combat scenarios could be entered and exited, which will need to be elaborated to update the game from combat results and to offer interaction options other than combat when confronting mature plants. I also made sure to add controls for the ESC key ending the game, so that players don't get stuck and have to CTRL+ALT+Delete to get out. 
Lots to do!