Task1 and Task2, deleted some unused imports and changed Task 2 build to use JDK7