Trying to fix seed file
Fix merge conflict on seed file
Made adventure display page mobile responsive
Fixed merge conflict on adventure display page
Merge pull request #122 from cicadas-2014/jason

change button size
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #123 from JessicaTatham/master

Made adventure display page mobile responsive
Readded add Adventure form and styled user home page
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Added deleted code that was being called somewhere and then deleted where it was being called and now everything is all good.
Merge pull request #124 from JessicaTatham/master

	Added deleted code that was being called somewhere and then deleted it and where it was being called
Added image captions to images in gallery
Merge pull request #125 from JessicaTatham/master

Added image captions to images in gallery
work on 3rd page
work on 3rd page