first checking!
Merge github.com:KyleBumpus/Solojourner