username now optional, login with UN or email, moved login button to left of cart on navbar, added border between login/cart buttons
Merge pull request #7 from danmee10/master

login stuff