Merge branch 'master' of https://github.com/jkyuh1202/Theme_Assignment

Conflicts:
	style.css
a