merging
Merge branch 'front-end' of https://github.com/kelleystephens/dating into front-end