Development of error logging
Merge branch 'master' of https://github.com/jeffrobdun/dev

Merge