Simple changes
Merge branch 'demo' of https://github.com/pdiazv/biscotti into demo
Adding employee given a json
initial commit for users
Ability to add user and activities.
Merging changes and fixing conflicts
Merge branch 'demo'