commit mysql server
Merge remote-tracking branch 'origin/master' into cidster
Merge branch 'cidster' of https://github.com/jgimbel/SEfall2013 into cidster