Up!
cleaning
Merge branch 'del'

Conflicts:
	db/test.sqlite3
	log/test.log
	tmp/pids/server.pid
	tmp/rspec_guard_result