regular commit
h
Merge branch 'master' of https://github.com/kcrawded77/TestApp

Conflicts:
	RoamerTestApp.xcodeproj/project.pbxproj
	RoamerTestApp/RatesSavingsView.xib
	RoamerTestApp/RatesViewController.h
	RoamerTestApp/RatesViewController.m
	RoamerTestApp/en.lproj/ViewController.xib
z
Merge branch 'master' of https://github.com/kcrawded77/TestApp

Conflicts:
	RoamerTestApp/Navigation/NavigationBar.m
	RoamerTestApp/RatesViewController.m