add *
add all
add all
Merge branch 'master' of https://github.com/crepesofwrath/jeandeflorette.com

Conflicts:
	logout.php
	t1/css/style.css
	t1/footer.html
	t1/header.html
	t1/index.html
	t1/login.html
	t1/post-edit.html
	t1/post.html
	t1/profile.html
	t1/search.html
	t1/signup.html