Pulling from origin master.

diff --cc src/tanks/Game.h
index 7bd6a65,50950df..625d40e
--- 1/tanks/tanks/Game.h
--- 2/src/tanks/Game.h
+++ b/src/tanks/Game.h
@@@ -8,11 -8,11 +8,10 @@@
  
  #import <Foundation/Foundation.h>
  #import "Sparrow.h"
- #import "Game/Unit/Unit.h"
- 
+ #import "tanks/unit/Unit.h"
  
 -
  @interface Game : SPStage
  
- @property(nonatomic, assign) Unit* unit;
+ @property(retain) Unit* unit;
  
  @end