added edit path to addresses and made a seperate partial to render a users addresses. Also fixed a few bugs with link to, currently thinking about how to render edit page for addresses
removed redundant method from user controller
fixed merge conflict
problem with vi editor fixed
added addresses route to my routes file
Merge branch 'master' of https://github.com/fluxusfrequency/fourth_meal into address
Merge branch 'master' of https://github.com/fluxusfrequency/fourth_meal into address
removed redundant route from address nested within restaurants
created new address view and edit address
address section is almost complete just check the diff and figure out what I did
fixed merge conflict
Merge branch 'address' of git://github.com/Adam89/fourth_meal into adam_address
renamed feature test folder to integration, to allow running rake test:integration command
fixed user checkout test for new workflow (no intermediate address selection step)