Renamed Merlin.java to MerlinLogic.java

gitignore update on metadata