Fixing merge conflict
Fixing merge conflict

nyc-pocket-gophers-2015/homeBase,ScottBWar/homeBase,ScottBWar/homeBase,ScottBWar/homeBase,ScottBWar/homeBase,nyc-pocket-gophers-2015/homeBase,nyc-pocket-gophers-2015/homeBase,ScottBWar/homeBase,nyc-pocket-gophers-2015/homeBase,nyc-pocket-gophers-2015/homeBase,ScottBWar/homeBase,nyc-pocket-gophers-2015/homeBase