added border to image view and changed challenge info background color
Merge branch 'master' of https://github.com/Fortisque/anappleaday

Conflicts:
	An Apple A Day/Base.lproj/Main.storyboard