Trying
new .gitignore
Merge branch 'master' of github.com:emimafia/emimafia-guide

Conflicts:
	htdocs/scripts/templates/connect.php