added main method to class main
commit
Merge branch 'Module1'

Conflicts:
	.idea/workspace.xml