Made changes to the js files. workign with this website to pull info and modifying it. We might want to ask quinn about more api stuff
weather.js changes
Merge branch 'master' of https://github.com/carney071/codeNameWEAR

Conflicts:
	Resources/iphone/alloy/styles/index.js
	app/controllers/index.js