Merge pull request #1 from paufsc/master

first pull request
templates updated
Merge pull request #21 from ozgurince/master

Templates