input textview
Merge branch 'master' of https://github.com/Littlebox222/WeScreen

Conflicts:
	WeScreen.xcodeproj/project.xcworkspace/xcshareddata/WeScreen.xccheckout
	WeScreen/MainViewController.m