rm thumbs.db
babyshower
Merge branch 'babyshower'

Conflicts:
	mitaka/static/css/shower.css
	mitaka/static/images/shower/Thumbs.db
	mitaka/static/images/shower/directions.png
	mitaka/static/images/shower/elephant.jpg
	mitaka/static/images/shower/registry.png
	mitaka/static/images/shower/rsvp.png
	mitaka/static/images/stories/Thumbs.db
	mitaka/templates/babyshower.html
	mitaka/templates/directions.html