add routes to routes.rb
Merge branch 'master' of github.com:tangosource/trainees-2013-H2-3 into developer_rb
Merge pull request #32 from tangosource/developer_rb

Developer rb