Squashed commit of the following:

commit a2319d44a1b3e65616f56f0823730f3c7c4a2e52
Author: Manish D <manish.dahigavakar@gmail.com>
Date:   Thu Jun 27 18:16:39 2013 +0530

     from local branch

commit 1f8090ddefe080f610684c60b59e5534971a0671
Author: Manish D <manish.dahigavakar@gmail.com>
Date:   Thu Jun 27 18:16:39 2013 +0530

     from local branch

commit 57f41ed28be7259376ddc54670662da2f7cb3bcf
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