Merge pull request #1 from jkru/master

Updates from Julie & Heather
Merge pull request #2 from jkru/master

merge in reconciled repo
added function to user class for login verification
Merge pull request #3 from jkru/master

reconcile
merged changes from julie & heather
Merge pull request #7 from lzhou89/master

getting new model thing