commit for pull
Merge branches 'master' and 'master' of github.com:Ap1ication/hamiltonBE

# By davemuir
# Via davemuir
* 'master' of github.com:Ap1ication/hamiltonBE:
  installed package

# By davemuir
# Via davemuir
* 'master' of github.com:Ap1ication/hamiltonBE:
  installed package

Conflicts:
	application/config/database.php
	application/config/generated_overrides/concrete.php
deleted a package