debug log
Merge branch 'master' of https://github.com/phiphii/zend_medicament

Conflicts:
	var/log/debug.log
gitignonre