fixed tests abit
Merge pull request #49 from kunovsky/new_fixes

fixed tests abit
navbar links test working
user can edit their information
deleted show route because it's uncessary, todo: change views so that edit button doesn't show up for facebook user
Merge pull request #51 from kunovsky/testing

elaine's navbar and user editing tests, some user controller editing
fixed merge conflict