Tired
Merge branch 'master' of https://github.com/Staed/Staed.github.io

Conflicts:
	post.php