conflict resolution

deleted my local log/development.log file to avoid conflict
Merge branch 'master' of https://github.com/schumi399/klaseko-build

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