conflicts
provide link to update page and session for facebook login
after registeration, the user is logged right in
styling the invite system
Merge branch 'master' of git@github.com:fattchris/MUSElink.git
remvoed bogus news
stuff
committed for live