new file:   EH-101_icon_mini.png
new file:   README.md
new file:   common-close-page.inc.php
new file:   common-display-heading.inc.php
new file:   common-functions.inc.php
new file:   common-open-page.inc.php
new file:   common-set-connection.inc.php
new file:   common-set-doctype.inc.php
new file:   common-set-header.inc.php
new file:   common-set-xml.inc.php
new file:   common-stylesheet.css
new file:   differiti-database-fix-encoding.php
new file:   differiti-database-insert.php
new file:   differiti-display-single.inc.php
new file:   differiti-display.php
new file:   differiti-factory-queriesAndCaptions.inc.php
new file:   differiti-factory-rows.inc.php
new file:   differiti-fix-encoding.php
new file:   differiti-form-upload.php
new file:   differiti-home.php
new file:   differiti-modifica-formBuilder.inc.php
new file:   differiti-modifica.php
new file:   edit_icon_mini.png
new file:   edit_icon_mini_mirrored.png
new file:   favicon.ico
new file:   index.php
new file:   logo_ge1.jpg
new file:   patch_ge1.png
new file:   personale-database-insert.php
new file:   personale-form-upload.php
new file:   personale-home.php
new file:   rabiohead-webfont.eot
new file:   rabiohead-webfont.svg
new file:   rabiohead-webfont.ttf
new file:   rabiohead-webfont.woff
new file:   search_lens_mini.png
new file:   upload_icon_mini.png
new file:   website_under_construction.png
Merge branch 'master' of github.com:mtlthebest/GE1

Conflicts:
	common-display-heading.inc.php
	common-set-connection.inc.php
	common-stylesheet.css
	differiti-home.php

new file:   GRUPELICOT UNO.jpg
modified:   common-display-heading.inc.php
modified:   common-set-connection.inc.php
modified:   common-stylesheet.css
modified:   differiti-home.php
modified:   common-display-heading.inc.php
modified:   common-set-connection.inc.php
modified:   common-stylesheet.css
modified:   differiti-home.php