fix update 9/9/2013
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css