merge
not tracking log files
added forever dependency (used by server)