Merged with upstream and updated ignore file
Merge pull request #20 from DevinGonzalez/master

Updated ignore file
Merge branch 'master' of https://github.com/TheHoneybadgers/frop into api