readme conflict
Merge branch 'master' of https://github.com/woutertinbergen/solarapp

Conflicts:
	README.md