initial commit to paul
initMerge branch 'Paul' of github.com:louishawkins/addressbook into Paul

Conflicts:
	README.md
	public/add_address.php
	public/edit_address.php
	public/edit_person.php
	public/includes/address.class.php
	public/includes/config.inc.php
	public/includes/dbconnect.php
	public/includes/model.class.php
	public/includes/person.class.php
	public/index.php
	public/templates/address.form.php
	public/templates/person.form.php
first change to readme
Merge pull request #4 from louishawkins/Louis

Louis
Added first draft of index page and css and images
First real index.php
Merge branch 'master' of github.com:louishawkins/addressbook into Paul

Conflicts:
	README.md
	public/css/custom.css
	public/index.php
Merge pull request #1 from louishawkins/Paul

Here is the first real index page.
configured db files
Merge branch 'master' of github.com:louishawkins/addressbook into Louis
Pull in the new index file and other stuff
>>>>>>> 94e59c14599b71f151f9d7466e4a226a048f109e