s
Merge branch 'master' of github.com:flosell/hackathon-solarcalc
added ngAnimate
fix merge conflicts
Merge branch 'master' of github.com:flosell/hackathon-solarcalc