Merged Battle Controller and Item folders.
Merged all three branches together.