stupid eclipse is stupid.
Merge remote-tracking branch 'nlay/master'

Conflicts:
	Unbearable/.classpath
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.
Added a scrolling background for the game
Merge commit '60d6ae4976d2b8534d607492e8e984ee4ee6f77c'