added git ignore
updated title tag
resolved confilct

Conflicts:
	src/foundationphp/UploadFile.php