Gitignore updated
merge
Scanner class added
Worked on functionality. Not finished!