added class1
Merge branch 'Module2'

Conflicts:
	.idea/workspace.xml