Initial save on caladan.
Merge branch 'master' of github.com:WheezePuppet/weight

Conflicts:
	db.R
	mysql_config.R
	server.R
	ui.R