Squashed commit of the following:

commit b00549998365ebbc20db8e8ace9adf7a71c5c4b9
Author: Manish D <manish.dahigavakar@gmail.com>
Date:   Thu Jun 27 15:58:58 2013 +0530

     initial commit

commit 7f2e72f430a8807c8a5b181f4ee2c44f55a45b09
Author: Manish D <manish.dahigavakar@gmail.com>
Date:   Thu Jun 27 14:33:56 2013 +0530

    index on master: d9d4473 commit from github for conflict