I will commit over your changes
Trying
Added a comment
Trying to figure out conflict resolution
Maybe this resolution works?
Trying Rebase
Trying once more
Merge branch 'master' of https://github.com/kirre-bylund/practicalparrot

Conflicts:
	workspace/src/combitech/mobile/practicalparrot/GameHandler.java
	workspace/src/combitech/mobile/practicalparrot/mainWindowButton.java