fixed route
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team4
fixins
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team4
yet another merge conflict
minor
fixed merge conflict
fixed merge conflict
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team4
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team4
added some functionality
fixed merge conflicts
added tagline and played around with showAll but didnt work so took off
Merge pull request #21 from margaretgodowns/master

Y'all might want to make sure this doesn't break anything...