Updated DataBase.java
Merged Branches properly & Added shifts