photo
Merge pull request #29 from belindahare/master

photo
trying to figure out routes
fixed forms
Merge pull request #30 from slwaller/master

fixed forms
display changes
Merge pull request #31 from belindahare/master

display changes
joint table functionality
joint table functionality
Merge pull request #32 from slwaller/master

joint table functionality
fine tuning
merge
Merge pull request #33 from belindahare/master

fine tuning
minor adjustments to show pages
minor adjustments to show pages
Merge pull request #34 from slwaller/master

minor adjustments to show pages
header change
Merge pull request #35 from belindahare/master

header change
fix merge
Merge pull request #36 from slwaller/master

fix merge