Initial commit
Merge branch 'master' of github.com:EdwardGong/trendy_blog

Conflicts:
	.gitignore