Updated .gitignore to ignore Eclipse Files.
Server takes directoryPath and httpPort from main()
Merge branch 'master' of https://github.com/tatwater/web-based-ftp into
Teagan

Conflicts:
	src/webftp/Server.java
Merge branch 'master' of ssh://git@github.com/tatwater/web-based-ftp.git
Merge branch 'Teagan'

Conflicts:
	src/jhttp2/HTTPClient.java
	src/jhttp2/HTTPServer.java
	src/webftp/Server.java