Testing. End of 1/31/2013

Was working on figure class and military class integration
Changed the file layout and makefile