- update gitignore
Merge branch 'master' of https://github.com/doxadigital/joomla_toolbox

Conflicts:
	git/gitignore.txt