added gitignore
Merge branch 'master' into implemented_photo_management

Conflicts:
	.gitignore
	tools/connect.php
added .gitkeep to images directory