updating master branch with latest changes
Added sessions and authentication
Merge pull request #12 from phoebebscott/marysbranch

updating master branch with latest changes
sessions and authentication
resolved issues with _content
Merge pull request #13 from phoebebscott/authbranch

Added sessions and authentication
content view changes
working on tests kinda
messing with stuff
Merge branch 'master' of https://github.com/phoebebscott/Luxelist

Conflicts:
	app/views/layouts/_content.html.erb
Merge pull request #16 from phoebebscott/ErnestsBranch3

Ernests branch3
Merge branch 'master' of https://github.com/phoebebscott/Luxelist
Hannahs magic api cross referencing