added routes
merge fixes
Merge pull request #4 from dyoachim/associations_and_setup

added routes