Merge pull request #20 from tangosource/developer_rb

previous view of project
Merge branch 'master' of github.com:tangosource/trainees-2013-H2-3 into developer_rb