second 2
Merge branch 'master' of https://github.com/mmirzaghitov/forfun

Conflicts:
	ForFun/src/md/fidelio/forfun/Main.java