Merge branch 'master' of https://github.com/MarkRabey/GroundWork-PHP

* 'master' of https://github.com/MarkRabey/GroundWork-PHP:
  default DB config
  Move README.md
  Move to Vagrant Box
  add site class, I'm going home.
  no message
  update config

Conflicts:
	groundwork/templates/admin/includes/footer.php
Merge branch 'master' into backend

* master:
  default DB config
  Move README.md
  Move to Vagrant Box
  add site class, I'm going home.
Merge branch 'master' of https://github.com/MarkRabey/GroundWork-PHP into backend

* 'master' of https://github.com/MarkRabey/GroundWork-PHP:
  default DB config
  Move README.md
  Move to Vagrant Box
  add site class, I'm going home.
  no message
  update config

Conflicts:
	groundwork/templates/admin/includes/footer.php
Merge branch 'backend'

* backend:
  Merge branch 'master' of https://github.com/MarkRabey/GroundWork-PHP

Conflicts:
	groundwork/templates/admin/includes/footer.php