added google charts
fixed merge conflicts
added style to calc results
Merge branch 'master' of github.com:flosell/hackathon-solarcalc