Start main function

Start main function
Merge branch 'master' of https://github.com/atroxaper/university-android-task4

Conflicts:
	new-file.txt