Working on candle and moving folder
Merge branch 'master' of https://github.com/isjackwild/Magic-Cat-Website

Conflicts:
	styles/style.css