Merge pull request #1 from JGK1213/matt

hi all
kirby commit
Merge pull request #2 from JGK1213/kirby

kirby commit
changes
Merge pull request #3 from JGK1213/jackie

changes
fitgem yayyyy
Merge pull request #4 from JGK1213/jackie

fitgem yayyyy
add rspec
running rspec
Merge pull request #5 from JGK1213/jackie

Jackie
index change
Merge pull request #6 from JGK1213/jackie

index change
gemfile changes
Merge pull request #7 from JGK1213/jackie

gemfile changes
fonso fixin
stuff by fons
Merge branch 'master' of https://github.com/JGK1213/Journey