wired some stuff up
Merge remote-tracking branch 'origin/master'
trying to get things to save