removed <<<< Head and refs/stalker/master from the Main.java file. The
<<<< Head and refs were remainders from the merge.