Added Window management, Engine class stub, audio stub.  Gross Windows stuff almost done.
Fixed some merging errors
Properly merged everything, compiles now (and produces an empty window).