Merge pull request #29 from Eye-Static/zach

Zach
Style signin page
fixing conficts
fixing conflicts
Fixing conflict
fixing conflicts
Merge pull request #30 from Eye-Static/eblbranch

Style signin page
resolved css html conflicts