logs
Merge branch 'master' of https://github.com/cnicyriver/print-service

Conflicts:
	logs/2014-07-25_error.txt