fixing readme for real
Merge branch 'master' of github.com:Tamman/pizza-weather into gh-pages

Conflicts:
	README.md
Merge branch 'gh-pages' of github.com:Tamman/pizza-weather into gh-pages
setting up grunt stuff..cuz
updated README