Checkpoint
	Checkpoint
Merge branch 'ruby_webserver_branch' of github.com:tepperly/QSO-Party into ruby_webserver_branch
      Fix power

Conflicts:
	server/logscan.rb