ok
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014

Conflicts:
	class016/Vladimir_Yordanov_B_9/generate.rb
	class016/Vladimir_Yordanov_B_9/task1.eruby
	class016/Vladimir_Yordanov_B_9/task1.rb
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014