Merge pull request #3 from aelkner/master

Testing the whole pull request process
Added person.css to style staff display.  Fixed space in css import loop.
Merge pull request #4 from jelkner/master

Added person.css and fixed missing space in css import
Deleted pickled_staff file from data directory.
Merge pull request #6 from jelkner/master

Removed dead data file
Added port option for server
Merge pull request #7 from mattva01/master

Added a port option to site.py
Merge remote-tracking branch 'gctaa/master'

Conflicts:
	templates/layout.tpl