Merge branch 'master', remote branch 'origin/master'
Added logging to file (should probably abstract it a bit, but eh