Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log

	.metadata/.plugins/org.eclipse.core.resources/.history/19/10405c541a5e00141ebbb85f7b4ab032

	.metadata/.plugins/org.eclipse.core.resources/.history/6e/40594c1257610014126e86b2dbe8f756

	.metadata/.plugins/org.eclipse.core.resources/.history/90/90d40388ed5e00141ad8d8ae3041b2d0

	.metadata/.plugins/org.eclipse.core.resources/.history/9c/a0f122a3fc5b00141a3dae5a6839a622

	.metadata/.plugins/org.eclipse.core.resources/.history/d7/504dc8032f5e00141d79a25d8df4d1f0

	.metadata/.plugins/org.eclipse.core.resources/.history/d9/3025fba8305e00141c8ab452838445b7

	.metadata/.plugins/org.eclipse.core.resources/.projects/Rain/.indexes/e4/81/a3/94/84/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/Rain/.indexes/e4/81/a3/94/8b/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/Rain/.indexes/e4/81/a3/94/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Rain/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/Rain/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Rain/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Rain/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/233123672.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml

	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	Rain/src/com/ready/rain/Game.java
	Rain/src/com/ready/rain/Level.java
Lastly