file paths
Merge branch 'master' of https://github.com/ibaranov/OhHa

Conflicts:
	DoodleJump/src/doodlejump/gui/Splash.java
com