test in progress
commit
Merge branch 'master' into userSearch
if user is logged in, it creates a new journey and lists the current journey at the top of the page
Merge pull request #14 from shawnbro/userSearch

User search