first commit
second commit
Merge remote-tracking branch 'upstream/master'
changes for devise
Devise changes added.
Layout changes added.
Merge pull request #1 from prashant4224/master

Layout changes added.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/devise/sessions/new.html.erb