moving some files
Merge branch 'master' of https://github.com/lisaplesko/roadtrip
beginning rewrite
merging with rewrite
fixed merge errors