update config
no message
Merge pull request #3 from MarkRabey/backend

Backend
Merge branch 'master' of https://github.com/MarkRabey/php-site

* 'master' of https://github.com/MarkRabey/php-site:
  update config
  no message
add site class, I'm going home.
Merge pull request #6 from MarkRabey/coresystem

add site class, I'm going home.
Move to Vagrant Box
Merge pull request #9 from MarkRabey/struct

Move to Vagrant Box
Move README.md
Merge pull request #10 from MarkRabey/struct

Move README.md
default DB config
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