init
Merge branch 'master' of github.com:justmao945/site

Conflicts:
	.gitignore