something
Merge branch 'master' of https://github.com/carney071/codeNameWEAR

Conflicts:
	Resources/iphone/alloy/constants.js
	Resources/iphone/alloy/controllers/index.js
updates to the styles and the some java script. Making the redditn app will be helpful for pulling the weather data.