Finished Error logging
Merge branch 'error-logging'
Deploy scripts