Merge pull request #1 from filipefmelo/development

Added .gitigonre rules
Merge pull request #2 from filipefmelo/master

Merge pull request #1 from filipefmelo/development