Merge pull request #17 from rarice4/master

added tasks controller
changed layout welcome
fixed merge issues
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
Merge pull request #20 from mwdion/master

added join table and fixed controllers
working out layouts
Merge pull request #21 from belindahare/master

working out layouts
jake test
Merge pull request #22 from jakehare/master

jake test
finished crud for task
Merge pull request #23 from mwdion/master

finished crud for task
added new layout page
Merge pull request #24 from belindahare/master

added new layout page
fixed home page lower_image
changed property controller so that the :id is fixed
fixed home page lower_image