changed test method return value to 7
Merge branch 'issue_chartboost' into develop
Merge branch 'develop' of https://github.com/ilkinulas/git_workshop into develop

Conflicts:
	Main.java