gitignore tweak
Merge branch 'master' of github.com:tzitziras/epilda

Conflicts:
	safe_gd/index.php
main patient edit form in 2 columns