added edit function
Merge branch 'development' of https://github.com/sweetlevy/Project_2_Grumpy_Cat into development

Conflicts:
	tmp/pids/server.pid
Merge branch 'development' of https://github.com/sweetlevy/Project_2_Grumpy_Cat into development