merged conflicts
Merge branch 'handshake' of https://github.com/djmalice/InstaDine into handshake