Merge branch 'master' of https://github.com/JonnyHonda/WeatherWeb

Conflicts:
	.gitignore