joyride
Merge pull request #73 from RKim220/ryan

joyride
resolve merge conlficts