Наведение красоты
e2
Merge branch 'iframes' into HEAD

Conflicts:
	src/generators/ThankYouGenerator.java
Merge branch 'iframes' into HEAD

Conflicts:
	src/generators/ThankYouGenerator.java