sekhar- conflicts resolved
sekhar- conflicts resolved and authentication created with devise
sekhar- conflicts resolved
sekhar- conflicts resolved