fixing merge conflict added missing javadocs and files
fixing merge conflict issue by  removing old code
added gameover exit functionality to RTS
Adding new units and elements to the game, and cleaning up the
images/actions
Merge branch 'aaronfrancescogame' of https://github.com/duke-compsci308-spring2013/vooga into aaronfrancescogame