Bringing back lost files from pulling 2.0-development
Merge branch '2.0-development' of https://github.com/Jonnycake/SimpleSite into 1.0.0-Initiative
Merge branch '1.0.0-Initiative' of https://github.com/Jonnycake/SimpleSite into 1.0.0-development