added fpdf & fpdi as submodules, removed old files

	new file:   .gitignore
	modified:   .gitmodules
	new file:   fpdf
	deleted:    fpdf17/FAQ.htm
	deleted:    fpdf17/changelog.htm
	deleted:    fpdf17/doc/acceptpagebreak.htm
	deleted:    fpdf17/doc/addfont.htm
	deleted:    fpdf17/doc/addlink.htm
	deleted:    fpdf17/doc/addpage.htm
	deleted:    fpdf17/doc/aliasnbpages.htm
	deleted:    fpdf17/doc/cell.htm
	deleted:    fpdf17/doc/close.htm
	deleted:    fpdf17/doc/error.htm
	deleted:    fpdf17/doc/footer.htm
	deleted:    fpdf17/doc/fpdf.htm
	deleted:    fpdf17/doc/getstringwidth.htm
	deleted:    fpdf17/doc/getx.htm
	deleted:    fpdf17/doc/gety.htm
	deleted:    fpdf17/doc/header.htm
	deleted:    fpdf17/doc/image.htm
	deleted:    fpdf17/doc/index.htm
	deleted:    fpdf17/doc/line.htm
	deleted:    fpdf17/doc/link.htm
	deleted:    fpdf17/doc/ln.htm
	deleted:    fpdf17/doc/multicell.htm
	deleted:    fpdf17/doc/output.htm
	deleted:    fpdf17/doc/pageno.htm
	deleted:    fpdf17/doc/rect.htm
	deleted:    fpdf17/doc/setauthor.htm
	deleted:    fpdf17/doc/setautopagebreak.htm
	deleted:    fpdf17/doc/setcompression.htm
	deleted:    fpdf17/doc/setcreator.htm
	deleted:    fpdf17/doc/setdisplaymode.htm
	deleted:    fpdf17/doc/setdrawcolor.htm
	deleted:    fpdf17/doc/setfillcolor.htm
	deleted:    fpdf17/doc/setfont.htm
	deleted:    fpdf17/doc/setfontsize.htm
	deleted:    fpdf17/doc/setkeywords.htm
	deleted:    fpdf17/doc/setleftmargin.htm
	deleted:    fpdf17/doc/setlinewidth.htm
	deleted:    fpdf17/doc/setlink.htm
	deleted:    fpdf17/doc/setmargins.htm
	deleted:    fpdf17/doc/setrightmargin.htm
	deleted:    fpdf17/doc/setsubject.htm
	deleted:    fpdf17/doc/settextcolor.htm
	deleted:    fpdf17/doc/settitle.htm
	deleted:    fpdf17/doc/settopmargin.htm
	deleted:    fpdf17/doc/setx.htm
	deleted:    fpdf17/doc/setxy.htm
	deleted:    fpdf17/doc/sety.htm
	deleted:    fpdf17/doc/text.htm
	deleted:    fpdf17/doc/write.htm
	deleted:    fpdf17/font/courier.php
	deleted:    fpdf17/font/courierb.php
	deleted:    fpdf17/font/courierbi.php
	deleted:    fpdf17/font/courieri.php
	deleted:    fpdf17/font/helvetica.php
	deleted:    fpdf17/font/helveticab.php
	deleted:    fpdf17/font/helveticabi.php
	deleted:    fpdf17/font/helveticai.php
	deleted:    fpdf17/font/symbol.php
	deleted:    fpdf17/font/times.php
	deleted:    fpdf17/font/timesb.php
	deleted:    fpdf17/font/timesbi.php
	deleted:    fpdf17/font/timesi.php
	deleted:    fpdf17/font/zapfdingbats.php
	deleted:    fpdf17/fpdf.css
	deleted:    fpdf17/fpdf.php
	deleted:    fpdf17/fpdf_tpl.php
	deleted:    fpdf17/install.txt
	deleted:    fpdf17/license.txt
	deleted:    fpdf17/makefont/cp1250.map
	deleted:    fpdf17/makefont/cp1251.map
	deleted:    fpdf17/makefont/cp1252.map
	deleted:    fpdf17/makefont/cp1253.map
	deleted:    fpdf17/makefont/cp1254.map
	deleted:    fpdf17/makefont/cp1255.map
	deleted:    fpdf17/makefont/cp1257.map
	deleted:    fpdf17/makefont/cp1258.map
	deleted:    fpdf17/makefont/cp874.map
	deleted:    fpdf17/makefont/iso-8859-1.map
	deleted:    fpdf17/makefont/iso-8859-11.map
	deleted:    fpdf17/makefont/iso-8859-15.map
	deleted:    fpdf17/makefont/iso-8859-16.map
	deleted:    fpdf17/makefont/iso-8859-2.map
	deleted:    fpdf17/makefont/iso-8859-4.map
	deleted:    fpdf17/makefont/iso-8859-5.map
	deleted:    fpdf17/makefont/iso-8859-7.map
	deleted:    fpdf17/makefont/iso-8859-9.map
	deleted:    fpdf17/makefont/koi8-r.map
	deleted:    fpdf17/makefont/koi8-u.map
	deleted:    fpdf17/makefont/makefont.php
	deleted:    fpdf17/makefont/ttfparser.php
	deleted:    fpdf17/tutorial/20k_c1.txt
	deleted:    fpdf17/tutorial/20k_c2.txt
	deleted:    fpdf17/tutorial/calligra.php
	deleted:    fpdf17/tutorial/calligra.ttf
	deleted:    fpdf17/tutorial/calligra.z
	deleted:    fpdf17/tutorial/countries.txt
	deleted:    fpdf17/tutorial/index.htm
	deleted:    fpdf17/tutorial/logo.png
	deleted:    fpdf17/tutorial/makefont.php
	deleted:    fpdf17/tutorial/tuto1.htm
	deleted:    fpdf17/tutorial/tuto1.php
	deleted:    fpdf17/tutorial/tuto2.htm
	deleted:    fpdf17/tutorial/tuto2.php
	deleted:    fpdf17/tutorial/tuto3.htm
	deleted:    fpdf17/tutorial/tuto3.php
	deleted:    fpdf17/tutorial/tuto4.htm
	deleted:    fpdf17/tutorial/tuto4.php
	deleted:    fpdf17/tutorial/tuto5.htm
	deleted:    fpdf17/tutorial/tuto5.php
	deleted:    fpdf17/tutorial/tuto6.htm
	deleted:    fpdf17/tutorial/tuto6.php
	deleted:    fpdf17/tutorial/tuto7.htm
	deleted:    fpdf17/tutorial/tuto7.php
	new file:   fpdi
	deleted:    fpdi-1.4.1/filters/FilterASCII85.php
	deleted:    fpdi-1.4.1/filters/FilterASCII85_FPDI.php
	deleted:    fpdi-1.4.1/filters/FilterLZW.php
	deleted:    fpdi-1.4.1/filters/FilterLZW_FPDI.php
	deleted:    fpdi-1.4.1/fpdi.php
	deleted:    fpdi-1.4.1/fpdi2tcpdf_bridge.php
	deleted:    fpdi-1.4.1/fpdi_pdf_parser.php
	deleted:    fpdi-1.4.1/pdf_context.php
	deleted:    fpdi-1.4.1/pdf_parser.php
added config.php, thus modified merge.php
	new file:   config.php
	modified:   merge.php
modified styles
	new file:   css/style.css
	modified:   file-uploader
	modified:   index.php
	modified:   merge.php
Merge branch 'master' of github.com:pappelt/pdfmerger