conflict issues resolved
added name field to sign-up
basic cancan implemented