forgot what i did
fixed merge conflicts
resource working for first time
Merge branch 'nate' into staging