Merge branch 'develop' of https://github.com/Dirty-A/Flatsite into develop

Conflicts:
	readme.md
Merge branch 'develop' of https://github.com/Dirty-A/Flatsite into develop

Conflicts:
	readme.md