Optimization

changed references to min js files
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/katrina.jpg