pulled stuff on main desktop
added sqlite 3 to get rails server working
added cancan authentication