Merge pull request #7 from CS180Fall2014/UI

Ui
login
Merge pull request #12 from CS180Fall2014/backend

merging  developer to backend