.
modified.
Merge branch 'master' of github.com:rarere/livedoorweatherlink

Conflicts:
	getlink.pl
	memo.txt
modified