Adding Josh's gitignore so we can have a clear conflict resolution path with the drupal 7.2 update
Adding Josh's gitignore so we can have a clear conflict resolution path with the drupal 7.2 update

joshkoenig/golden-god-demo,brainhell/drupalglass,lincgr/Prueba,lincgr/Prueba,OccupyWallStreet/streetnet,joshkoenig/golden-god-demo,OccupyWallStreet/streetnet,edutrul/social-web,brainhell/drupalglass,edutrul/social-web,edutrul/social-web,brainhell/drupalglass,joshkoenig/golden-god-demo,OccupyWallStreet/streetnet,joshkoenig/golden-god-demo,OccupyWallStreet/streetnet,joshkoenig/golden-god-demo,lincgr/Prueba,joshkoenig/golden-god-demo,lincgr/Prueba,brainhell/drupalglass,brainhell/drupalglass,joshkoenig/golden-god-demo,edutrul/social-web,edutrul/social-web