main page added
main page added
just commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
main-page added