Update .gitignore
Update .gitignore
Merge pull request #13 from sodanca/master

Added mantle to branch
Merge pull request #15 from sodanca/master

Added mantle to branch
Merge pull request #16 from sodanca/master

Added mantle to branch
Merge remote branch 'origin/sean'
Merge remote branch 'origin/roman'
Merge remote branch 'origin/newman'
Merge remote branch 'origin/felipe'