link to our website
gemlock added
fixed this
Merge pull request #11 from JYoung217/gemlock-merges

Gemlock merges
fixed merge issue
Merge branch 'master' of https://github.com/JYoung217/memorium
added all routes and empty controllers
added root
Merge pull request #12 from JYoung217/routes

Routes
all controllers
added routes and blank controllers
no phone number
Merge pull request #13 from JYoung217/controllers-all

Controllers all
Merge pull request #14 from JYoung217/facebok-oauth

hey there
basic homepage view
Merge pull request #15 from JYoung217/homepage-view

basic homepage view
next commit
Merge branch 'master' of https://github.com/JYoung217/memorium into facebok-oauth
frankenstein mode