styles...
Merge branch 'master' of github.com:brianshaler/wiblits
Merge branch 'master' of github.com:brianshaler/wiblits
twitter, login and register stuff
merged conflicts