added city to naming convention
added 2012 Big Design conference notes