not sure what i did
resolved merge conflicts
did some things
merging issues revolved
Merge branch 'master' of https://github.com/mariapacana/roominatr