Merge branch 'master' of https://github.com/neilfitz/wanderment
Merge branch 'master' of https://github.com/neilfitz/wanderment
modles
sss
Merge branch 'master' of https://github.com/neilfitz/wanderment

Conflicts:
	wanderment/posts/models.py
	wanderment/posts/urls.py
	wanderment/static/css/main.css
Deleting posts
Merge branch 'master' of https://github.com/neilfitz/wanderment

Conflicts:
	wanderment/posts/urls.py