Added tskeleton plugin
Added templates for .c and .h files
Resolved conflict