Ignore DS_Store.
Created an http server that acccepts a port flag and responds to requests.
Fixed merge conflicts with origin master.