recent work
Merge branch 'master' of https://bitbucket.org/iitm_inters_2014/book_shot