update..
Merge branch 'gh-pages' of https://github.com/evecalm/sunny into gh-pages

Conflicts:
	assets/main.js
update.