new feed
Merge branch 'master' of github.com:ronde-app/ronde
removed the join button on the dash if user has already joined
dash
merge conflict
added tour page
added tour page. still need to add somethings