calendar things
user log in logic
Merge pull request #18 from ahsterling/steph

Steph