addImage() finished
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git
Changed addShape method to used methods from imported TRiBE module
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git

Conflicts:
	src/gUIModule/SlidePanel.java
removed some comments
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git
playmedia changed
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git
Added Book.java with getters and setters for title, filename and button
icon
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git
new test T601 added, issues with VideoPlayer modularity found. Currently
working on them.
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git
Shapes work
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.
added timing
Test continued, attempt to fix VideoPlayer control panel viewing...
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git

Conflicts:
	src/BasicExample.xml
	src/gUIModule/SlidePanel.java
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git
Started work on EclipsePhase.xml