added user and Article models
did some more stuff
fiddling with django user auth
got login kind of working
fixed merges
added some views
Merge branch 'fb_login' of https://github.com/patrickqz/time_utilizer into fbLogin
merged with meiri
Merge branch 'fbLogin' of https://github.com/patrickqz/time_utilizer into fb_login
added some views
added some views
fb auth not working yet
login still not working, something with security
Added center text and options, but ugly
token able to be passed to the back
Merge branch 'fb_login' of https://github.com/patrickqz/time_utilizer into fbLogin