asdf
Merge branch 'master' of https://github.com/lunarmoon26/Toy2nd

Conflicts:
	my-includes/body_post.php
conflict resloved