testing
test commit
Merge pull request #4 from CS180Fall2014/map

test commit again
Merge pull request #3 from CS180Fall2014/cole

testing
testing
Beginning layout fragment
Beginning layout fragment
Merge pull request #5 from CS180Fall2014/cole

added beginning login layout
base login view
Merge pull request #9 from CS180Fall2014/cole

base login view
Merge pull request #11 from CS180Fall2014/UI

Ui