Added Year.java, some small changes
hotfix
Merge conflict fixed