final commit

uncommented scanner, last edit of the app before deadline