Added gitignore and added todo list
Learning about conflicts and setting up new folder for push