updated
Merge branch 'master' of github.com:jasonwynne/thebe

Conflicts:
	wp-content/themes/thebe/.DS_Store