osmos and garbled_email added
google code jam added
Merge branch 'master' into addedfiles