Merge pull request #18 from mwdion/master

changed layout welcome
sign in layout
fixed merge error
Merge pull request #19 from belindahare/master

sign in layout Great Merge!
added join table and fixed controllers