Squashed commit of the following:

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

     from local branch

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

     from local branch

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

     initial commit

commit 0de3c1512fbc8842a79da532c3754e2c71a6f042
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