Update basic1.java

Changes done for question rearrangements and added question tags