fixed graphs as per micah's ideas: from macro to micro, avg over time, did developed v developing countris;but also did energy intesity graphs: (energy/gdp)--important!  becaue otherwise we have spurious correlation--happiness seems positively related to energy because we omitted gdp that also relates positively to happiness and energy use ;;wrote down contributions;added couple references; added section How do we use energy? to address micah's questions about personal energy use;i added some comments replying to micah's comments at the begining of results section;;changed writeup according to micah comments; will be back at it again at latest on mon and will do more; also following two easterlin's pnas papers--so moved literature to appendix, also happiness discussion there; so basically in the body we indtroduce topic and then jump into results; also trying to use langage/style/approach etc from easterlin