Added Devise
added devise and header
merge devise and resolved conflict
make contact form work