achievementy
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/apptogo/runalien/obstacles/ObstacleGenerator.java