More StoryBoard Changes
un doing fire chat bullshit
new chat with parse
Merge branch 'Jing'

Conflicts:
	TextbookExchange.xcodeproj/project.pbxproj
Chat client mostly working
Merging
Final Chat Client Update
Merge remote-tracking branch 'origin/Jing'

Conflicts:
	TextbookExchange.xcodeproj/project.pbxproj
Merge branch 'Jing'

Conflicts:
	TextbookExchange.xcodeproj/project.pbxproj

TextbookExchange.xcodeproj/project.xcworkspace/xcuserdata/Qihong.xcuserd
atad/UserInterfaceState.xcuserstate
	TextbookExchange/AddBookViewController.h
	TextbookExchange/AddBookViewController.m
	TextbookExchange/Base.lproj/Main.storyboard
Final Updates
modified so that the keyboard is shown properly, and the view is adjusted properly when the keyboard is hidden.
Merge branch 'master' into Jing

Conflicts:

TextbookExchange.xcodeproj/project.xcworkspace/xcuserdata/Qihong.xcuserd
atad/UserInterfaceState.xcuserstate