updated gitignore, fixed bugs, added main
Conflicts resolved