I think this works but I may have fucked a lot of things on the side
where am I?
updating from master
adding pages controller
updating from master
shteo
merging from master
auth working, cleaned some things up too
Merge pull request #15 from jhendge/user_socrates_oauth

User socrates oauth