changed layout
hopefully resolved merge conflicts
Merge pull request #74 from fox-squirrels-2013/add_guest

Add guest