updated gitignore, fixed bug in popcorn