Working on insert/delete functions
Merge branch 'master' of https://github.com/mil0/441collabrify

Conflicts:
	Collabo/Collabo/CollaboClient.m
	Collabo/Collabo/ViewController.h
	Collabo/Collabo/ViewController.m
	Collabo/Collabo/en.lproj/MainStoryboard_iPhone.storyboard