Gitignore
Settings.php to be ignored
Merge branch 'master' of github.com:geonik500/patras_lug

Conflicts:
	sites/default/settings.php