updated readme and stuff
Merge branch 'master' of github.com:gabrieloc/renewable-energy