work from jan 15
fixed merge conflict and updated parse library
correctly size tableview cells