test
Merge branch 'master' of https://github.com/TwinTanner/weatherjournal

Conflicts:
	.classpath