change from solar
Merge branch 'master' of https://github.com/chrischne/solar

Conflicts:
	solar.js