Logging in works like a charm.
Minor comment revision
Made argument variables public.
Fixed another merge conflict
Added gitconfig p4merge