added two
added two in master
Merge branch 'two'

Conflicts:
	two
added janek.cs in master
added active.rb in master
Added repo from CodeProject.com
Added aspx and aspx.cs
Added readfile
Added aspx and aspx.cs