logged in
Merge pull request #7 from Ricepancakes/master

logged in