17.02.2013
pre-pull
mergefix
mergefix
18.02.2013
19.02.2013 not working
19.02.13 working
20.02.2013
20.02.13 add storyboard segue
clean code
CorePlot add to project
settings CorePlot
Clear code (22.02.13)
Code refactoring
25.02,13
correcting errors
mergefix
Merge branch 'mapview'

Conflicts:
	weather.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate