on new branch
link to messages in header, users are able to start conversation
Merge branch 'messages'
added booking systems
edit profile page gender, language level, email added
booking system with association
Added calendar feature
Merge remote-tracking branch 'upstream/master'
Updating
Merging

nch 'calendar'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
merged with my code
messages now are in conversations
prepared database for matching algorithm
fixed calendar bug, works with booking form
Merge pull request #11 from RuslanVikhor/master

edit profile page gender, language level, email added
conversations stuff updated
Merge branch 'messages'
sorted the edit page
added test
zzz