- Added background/foreground/logo and barebones main page layout
Fixing merge conflict.

Merge branch 'build' of github.com:inkycoder/hs-deck-site into build

Conflicts:
	client/build/templates/userTest.hbs