/ added before assets
Merge branch 'Kelly'

Conflicts:
	log/development.log
	tmp/pids/server.pid