http proxy test
Merge branch 'master' of http://github.com/bbk-pij-2012-66/Exercises.git