Fixed the post view and got the camera working
Fixed the post view and got the camera working
Reverting to working code
Revert "Fixed git error. Please pull before doing anything else"

This reverts commit a96f9e74c889c2cd68bece987ce12d8ccd1b6b06.

Conflicts:
	Zobelisk/.DS_Store
	Zobelisk/Zobelisk.xcodeproj/project.xcworkspace/xcuserdata/Victor.xcuserdatad/UserInterfaceState.xcuserstate
	Zobelisk/Zobelisk.xcodeproj/xcuserdata/Victor.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Zobelisk/Zobelisk/Base.lproj/Main.storyboard
Added comments view, added camera
Keyboard functionality and working on placeholders
Merge remote-tracking branch 'origin/master'