diff -r d8e41ee0b3ae -r 987ec27b6042 cocoaTouch/otherSrc/CommodityFunctions.h
--- a/cocoaTouch/otherSrc/CommodityFunctions.h	Fri Apr 09 21:08:27 2010 +0000
+++ b/cocoaTouch/otherSrc/CommodityFunctions.h	Sat Apr 10 01:09:29 2010 +0000
@@ -10,10 +10,12 @@
 
 #define MAX_HOGS 8
 
-#define TEAMS_DIRECTORY()   [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) \
-                             objectAtIndex:0] stringByAppendingString:@"/Teams/"]
-#define HATS_DIRECTORY()    [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"]
-#define FLAGS_DIRECTORY()   [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Flags/"]
-#define FORTS_DIRECTORY()   [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Forts/"]
+#define TEAMS_DIRECTORY()       [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) \
+                                 objectAtIndex:0] stringByAppendingString:@"/Teams/"]
+#define GRAPHICS_DIRECTORY()    [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/"]
+#define HATS_DIRECTORY()        [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"]
+#define FLAGS_DIRECTORY()       [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Flags/"]
+#define FORTS_DIRECTORY()       [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Forts/"]
 
 void createTeamNamed (NSString *nameWithoutExt);
+UIImage *mergeTwoImages (UIImage *firstImage, UIImage *secondImage);