final version 29/10/2014

final version 29/10/2014
Everything except for delete is working