Merge pull request #11 from rarice4/master

fixed schema
added cancan gem
Merge pull request #12 from mwdion/master

added cancan gem
added admin to devise
added bootstrap, started landing page
merge error in schema again
Merge pull request #14 from belindahare/master

added bootstrap, started landing page
divided controllers among admin and user
Merge pull request #13 from mwdion/master

added admin to devise
fixed user authentication
merge fix schema and landlord files
Merge pull request #15 from mwdion/master

fixed user authentication
styled front page
fixed merge errors
Merge pull request #16 from belindahare/master

styled front page
added tasks controller