initial commit
Merge branch 'master' of github.com:jonnyandreola/weather-app

Conflicts:
	.gitignore