preliminary code
Merge branch 'armando_branch' of github.com:shrapnelstorm/short_shorts into siva_branch
lock server code added