almost done!!! gallery + thebigday finishing touches
don't show caption if there isn't one in image gallery'
Merge branch 'master' of github.com:allisonnorman/christofer-and-stephanie

Conflicts:
	css/stylesheet.css
maybe all finished!?