Merge pull request #1 from LasseSviland/master

added rails setup
Update .gitignore
Merge pull request #2 from LasseSviland/master

Update .gitignore
Delete .DS_Store
Added final wireframe and moved WIP wireframes into folder
Update README.md
Merge pull request #3 from JessicaTatham/master

Added final wireframe and moved WIP wireframes into folder
add travis cd
Merge pull request #4 from DineshRai/add_travis

add travis cd
Create migrations for adventure, country, image, and countryadventure. Added a seed of 20 adventures. And added secret.yml file.
add helper methods
add helper methods
Fixed merge conflict on secret.yml file and routes
Merge pull request #5 from JessicaTatham/Jess

Create migrations for adventure, country, image, and countryadventure. A...
Merge branch 'master' into create_user_helpers
Merge pull request #6 from DineshRai/create_user_helpers

Create user helpers
WIP making the view for adventures to test database functionality
Fixed merge conflict for fixing bug in application helper
updated css
Updated gemfile