Mytest
commit
v2
test 2
Merge branch 'master' of https://github.com/magruene/SeaPal.git
fghfhdsfj
Merge branch 'master' of https://github.com/magruene/SeaPal.git

Conflicts:
	SeaPal/WebContent/SeaPalWeatherForm.html