Changed name of Login
Merge pull request #16 from CS180Fall2014/cole

Changed name of Login
Merge pull request #18 from CS180Fall2014/UI

Ui