Merge branch 'master' into development
Updated comments in the source code
Comment Added inline
Merge branch 'development'

Conflicts:
	MainStoryboard.storyboard

Ribbit.xcodeproj/project.xcworkspace/xcuserdata/kevin.xcuserdatad/UserIn
terfaceState.xcuserstate
	Ribbit/AppDelegate.h
	Ribbit/AppDelegate.m
	Ribbit/CameraViewController.h
	Ribbit/CameraViewController.m
	Ribbit/EditFriendsViewController.h
	Ribbit/EditFriendsViewController.m
	Ribbit/FriendsViewController.h
	Ribbit/FriendsViewController.m
	Ribbit/GravatarUrlBuilder.h
	Ribbit/GravatarUrlBuilder.m
	Ribbit/ImageViewController.h
	Ribbit/ImageViewController.m
	Ribbit/InboxViewController.h
	Ribbit/InboxViewController.m
	Ribbit/LoginViewController.h
	Ribbit/LoginViewController.m
	Ribbit/SignupViewController.h
	Ribbit/SignupViewController.m
	Ribbit/TPKeyboardAvoidingScrollView.h
	Ribbit/TPKeyboardAvoidingScrollView.m
	Ribbit/main.m
Comments added inline