andrews unify changes
adrews changes
latest files from FTP site
removed uneccesary files
Merge branch 'master' into Andrew's-FTP

Conflicts:
	index.php
deleted
Merge branch 'master' into Andrew's-FTP
removing unneeded files, AGAIN.
updates from ftp
changes from live server
removed index.html files, added ignore for unify

ignored unify files.
Merge branch 'Andrew's-FTP'

Conflicts:
	index.php