Layout
Merge branch 'master' of https://github.com/Hyunsuuu/SunrinCMS

Conflicts:
	.gitignore