Initial commit
Merge branch 'master' of https://github.com/johnny3/miniSite

Conflicts:
	.gitignore
	README.md