rado fixed
Merge branch 'master' of https://github.com/n0quarter/git_demo1

Conflicts:
	GAP.html